diff options
| -rw-r--r-- | debian/changelog | 19 | ||||
| -rw-r--r-- | debian/control | 16 | ||||
| -rwxr-xr-x | debian/rules | 10 |
3 files changed, 34 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 94bdeba75..0cad69125 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +glib2.0 (2.80.0-5) experimental; urgency=medium + + * Merge packaging from unstable + - Reinstate tests on 32-bit non-x86. + The required packages have become available now. + * Build with sysprof instrumentation on architectures that have it. + This currently means release architectures, plus the powerpc and ppc64 + ports. Make it possible to disable this with a (non-reproducible) + build profile, to facilitate re-bootstrapping. + + -- Simon McVittie <smcv@debian.org> Sun, 24 Mar 2024 18:21:29 +0000 + glib2.0 (2.80.0-4) experimental; urgency=medium * d/emulated-g-ir-tool.in: Rename from cross-g-ir-tool.in. @@ -133,6 +145,13 @@ glib2.0 (2.79.3-1) experimental; urgency=medium -- Simon McVittie <smcv@debian.org> Wed, 28 Feb 2024 13:15:47 +0000 +glib2.0 (2.78.4-6) unstable; urgency=medium + + * Reinstate tests on 32-bit non-x86. + The required packages have become available now. + + -- Simon McVittie <smcv@debian.org> Sun, 24 Mar 2024 13:47:15 +0000 + glib2.0 (2.78.4-5) unstable; urgency=medium * Temporarily skip all tests on 32-bit non-i386. diff --git a/debian/control b/debian/control index 0cde40fd6..050124146 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,7 @@ Build-Depends: dbus-daemon <!nocheck> <!noinsttest>, libmount-dev [linux-any], libpcre2-dev, libselinux1-dev [linux-any], + libsysprof-capture-4-dev (>= 3.38.0) [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x powerpc ppc64] <!pkg.glib2.0.nosysprof>, libxml2-utils, linux-libc-dev [linux-any], meson (>= 1.2.0), @@ -26,16 +27,16 @@ Build-Depends: dbus-daemon <!nocheck> <!noinsttest>, python3:native, xsltproc, zlib1g-dev -Build-Depends-Arch: desktop-file-utils [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, +Build-Depends-Arch: desktop-file-utils <!nocheck>, dh-sequence-gir <!nogir>, gobject-introspection (>= 1.78.1-18~) <!nogir>, - locales [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck> | locales-all [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, - python3-dbus [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, - python3-gi [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, + locales <!nocheck> | locales-all <!nocheck>, + python3-dbus <!nocheck>, + python3-gi <!nocheck>, qemu-user <cross !nogir>, - shared-mime-info [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, - tzdata [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck>, - xterm [!armel !armhf !hppa !m68k !powerpc !sh4] <!nocheck> + shared-mime-info <!nocheck>, + tzdata <!nocheck>, + xterm <!nocheck> Build-Depends-Indep: gi-docgen <!nodoc>, gobject-introspection (>= 1.78.1-18~) <!nodoc>, qemu-user <cross !nodoc>, @@ -158,6 +159,7 @@ Depends: libffi-dev, libmount-dev [linux-any], libpcre2-dev, libselinux1-dev [linux-any], + libsysprof-capture-4-dev (>= 3.38.0) [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x powerpc ppc64] <!pkg.glib2.0.nosysprof>, pkgconf, python3 | qemu-user [linux-any] | qemu-user-static [linux-any], zlib1g-dev, diff --git a/debian/rules b/debian/rules index d9c2d9fcd..5544057c8 100755 --- a/debian/rules +++ b/debian/rules @@ -157,9 +157,6 @@ endif override_dh_auto_test-arch: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) -ifeq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32) - : TODO Tests skipped on 32-bit non-i386 for 64-bit time_t rebootstrap -else # Remove LD_PRELOAD so we don't run with fakeroot, which makes dbus-related tests fail # Remove LANGUAGE to avoid mismatches between expected and actual # messages in non-English locales (mainly on reproducible-builds) @@ -226,7 +223,6 @@ else --verbose \ || true endif -endif # Skip build-time tests if all we are building is documentation; # running them once per architecture is plenty. @@ -286,6 +282,12 @@ else DEB_CONFIGURE_FLAGS_deb += -Ddocumentation=false endif +ifeq ($(filter pkg.glib2.0.nosysprof,$(DEB_BUILD_PROFILES)),) +ifneq ($(filter amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x powerpc ppc64,$(DEB_HOST_ARCH)),) +DEB_CONFIGURE_FLAGS_deb += -Dsysprof=enabled +endif +endif + DEB_CONFIGURE_FLAGS_udeb := \ --default-library shared \ -Ddocumentation=false \ |