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.
This commit is contained in:
Simon McVittie
2024-03-14 18:03:18 +00:00
parent e657440a93
commit d38deea907
2 changed files with 7 additions and 4 deletions

2
debian/control vendored
View File

@ -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),

9
debian/rules vendored
View File

@ -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