From dfb0db5ba0d95cd3565b640a98c36f0021bbc445 Mon Sep 17 00:00:00 2001 From: Ngo Quoc Dat Date: Sat, 31 Oct 2026 17:03:34 +0700 Subject: [PATCH] build(linux): give the package builds room for DuckDB 2.0 --- linux/build-aux/debian/rules | 4 ++++ linux/crates/app/meson.build | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/linux/build-aux/debian/rules b/linux/build-aux/debian/rules index 2138013052..cc8a912ba9 100755 --- a/linux/build-aux/debian/rules +++ b/linux/build-aux/debian/rules @@ -33,6 +33,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto %: dh $@ --buildsystem=meson +# DuckDB 2.0's C++ debug info passes dwz's limit of 50 million DIEs, and +# dwz then fails the build instead of leaving the file as it is. +override_dh_dwz: + # dh_clean deletes *.orig files, and every vendored crate ships a # Cargo.toml.orig that its .cargo-checksum.json lists. override_dh_clean: diff --git a/linux/crates/app/meson.build b/linux/crates/app/meson.build index ee44c97e10..0ea3ecc0ca 100644 --- a/linux/crates/app/meson.build +++ b/linux/crates/app/meson.build @@ -53,7 +53,9 @@ if profile != 'development' endif # The workspace suite excludes the app, whose tests need a display and -# the GTK test accessibility backend. +# the GTK test accessibility backend. A package build compiles its tests in +# the release profile, DuckDB's C++ a second time among them, which took +# more than an hour on a 4-core builder with DuckDB 2.0. test( 'workspace', cargo, @@ -61,7 +63,7 @@ test( env: test_env, suite: 'unit', is_parallel: false, - timeout: 3600, + timeout: 7200, ) gtk_env = app_env