From 7208f6ac28940de6b66af4512cb7d8616adeb279 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 14 Mar 2024 18:04:15 +0000 Subject: [PATCH] d/control, d/rules: Temporarily disable cloudproviders on 32-bit non-x86 This is not yet buildable on the architectures affected by the 64-bit time_t transition, with a dependency chain involving graphviz and GTK 2. --- debian/control | 2 +- debian/rules | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 582049df9a..a82893b90f 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: adwaita-icon-theme (>= 45.0-4~) [!armel !armhf !hppa !m68k !power libatk-bridge2.0-dev (>= 2.15.1), libatk1.0-dev (>= 2.35.1), libcairo2-dev (>= 1.14.0), - libcloudproviders-dev (>= 0.3.2), + libcloudproviders-dev (>= 0.3.2) [!armel !armhf !hppa !m68k !powerpc !sh4], libcolord-dev (>= 0.1.9) [!armel !armhf !hppa !m68k !powerpc !sh4], libcups2-dev (>= 1.7), libegl1-mesa-dev [linux-any], diff --git a/debian/rules b/debian/rules index 945901b05c..5462f07fb8 100755 --- a/debian/rules +++ b/debian/rules @@ -120,11 +120,15 @@ configure_flags_deb += -Dgtk_doc=true endif ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes), yes) -# Not in main repository -configure_flags_deb += -Dcloudproviders=false +# libcloudproviders is in Ubuntu "universe" +use_cloudproviders := false +else ifeq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32) +# Temporarily unbuildable during 64-bit time_t transition +use_cloudproviders := false else -configure_flags_deb += -Dcloudproviders=true +use_cloudproviders := true endif +configure_flags_deb += -Dcloudproviders=$(use_cloudproviders) configure_flags_udeb = \ -Dbroadway_backend=false \ @@ -271,8 +275,7 @@ override_dh_makeshlibs: dh_makeshlibs --remaining-packages -X$(MODULES_BASE_PATH) dpkg_gencontrol_args = -Vgtk:BinVer=$(GTK_BINVER_DEP) -# libcloudproviders is in Ubuntu "universe" -ifneq ($(shell dpkg-vendor --query vendor),Ubuntu) +ifeq ($(use_cloudproviders),true) dpkg_gencontrol_args += -VcloudProvider:Depends='libcloudproviders-dev (>= 0.3.2)' endif