[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#951754: libxkbcommon: allow to compile again on !linux archs



Source: libxkbcommon
Version: 0.9.1-1
Severity: important
Tags: patch
Control: found -1 0.10.0-1

Hi,

starting from 0.9.1-1, libxkbcommon cannot be built on non-Linux
architectures due to the unconditional Wayland-related build
dependencies. Considering that Wayland is Linux-specific, and the usage
of it is only in a demo/test, it is possible to restrict its usage only
on Linux architectures.

Patch attached for this.

Thanks,
-- 
Pino
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,10 @@ Build-Depends:
  meson,
  pkg-config,
  quilt,
- libwayland-dev,
+ libwayland-dev [linux-any],
  libx11-dev,
  libxcb-xkb-dev (>= 1.10),
- wayland-protocols,
+ wayland-protocols [linux-any],
  x11-xkb-utils,
  x11proto-core-dev,
  x11proto-kb-dev (>= 1.0.5),
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,15 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
+ifneq ($(DEB_HOST_ARCH_OS),linux)
+	extra_meson_args+="-Denable-wayland=false"
+endif
+
 # We need to point to xkb-data's files. The default should be OK but
 # let's be cautious:
 override_dh_auto_configure:
-	dh_auto_configure -- -Dxkb-config-root=/usr/share/X11/xkb
+	dh_auto_configure -- -Dxkb-config-root=/usr/share/X11/xkb $(extra_meson_args)
 
 # Kill *.la files, and forget no-one:
 override_dh_install:

Reply to: