From d38deea907af2b1720472f06c9f0905ea7665667 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 14 Mar 2024 18:03:18 +0000 Subject: [PATCH] d/control, d/rules: Temporarily disable colord on 32-bit non-i386 This is not yet buildable on the architectures affected by the 64-bit time_t transition. --- debian/control | 2 +- debian/rules | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 4f0598124e..582049df9a 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Build-Depends: adwaita-icon-theme (>= 45.0-4~) [!armel !armhf !hppa !m68k !power libatk1.0-dev (>= 2.35.1), libcairo2-dev (>= 1.14.0), libcloudproviders-dev (>= 0.3.2), - libcolord-dev (>= 0.1.9), + libcolord-dev (>= 0.1.9) [!armel !armhf !hppa !m68k !powerpc !sh4], libcups2-dev (>= 1.7), libegl1-mesa-dev [linux-any], libepoxy-dev (>= 1.4), diff --git a/debian/rules b/debian/rules index 12cc8f82be..945901b05c 100755 --- a/debian/rules +++ b/debian/rules @@ -92,11 +92,14 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) configure_flags_deb += --cross-file=$(DEB_HOST_GNU_TYPE)-gobject-introspection.ini endif -ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) -configure_flags_deb += -Dcolord=yes +ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES))) +use_colord := no +else ifeq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32) +use_colord := no else -configure_flags_deb += -Dcolord=no +use_colord := yes endif +configure_flags_deb += -Dcolord=$(use_colord) ifeq (linux,$(DEB_HOST_ARCH_OS)) configure_flags_deb += -Dwayland_backend=true