Bug#836687: wayland FTCBFS: cross builds require --with-host-scanner

[Manuel A. Fernandez Montecelo]

Hi,

2016-09-04 19:10 Helmut Grohne:

Source: wayland
Version: 1.11.0-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

wayland fails to cross build from source, because cross building
requires the configure option --with-host-scanner (and making a
wayland-scanner executable available to the build). Adding that flag
turned out not to be trivial due to the semantics of override_*-arch.
In my attached patch, I thus opt to avoid that technique and add
--disable-documentation depending on the dh_listpackages output instead.
I hope that works for you. Either way, the gist is that we need
--with-host-scanner for cross builds.


I suspect that Wayland would be an important package to bootstrap new
architectures, just as different X-related packages are needed today for
boostrapping very basic packages in the standard set.

Would it be possible to include this simple patch in your next uploads?

Since it's actively maintained, I guess that offering to NMU is not of
much help, but just in the case that you are busy we can look into it,
if you want.


Cheers.
--
Manuel A. Fernandez Montecelo 

Bug#836687: wayland FTCBFS: cross builds require --with-host-scanner

[Helmut Grohne]

Source: wayland
Version: 1.11.0-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

wayland fails to cross build from source, because cross building
requires the configure option --with-host-scanner (and making a
wayland-scanner executable available to the build). Adding that flag
turned out not to be trivial due to the semantics of override_*-arch.
In my attached patch, I thus opt to avoid that technique and add
--disable-documentation depending on the dh_listpackages output instead.
I hope that works for you. Either way, the gist is that we need
--with-host-scanner for cross builds.

Helmut
diff -u wayland-1.11.0/debian/changelog wayland-1.11.0/debian/changelog
--- wayland-1.11.0/debian/changelog
+++ wayland-1.11.0/debian/changelog
@@ -1,3 +1,11 @@
+wayland (1.11.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
++ Use wayland-scanner from libwayland-bin.
+
+ -- Helmut Grohne   Sun, 04 Sep 2016 14:27:28 +0200
+
 wayland (1.11.0-2) unstable; urgency=medium
 
   * d/control: libwayland-dev depends on libwayland-bin
diff -u wayland-1.11.0/debian/control wayland-1.11.0/debian/control
--- wayland-1.11.0/debian/control
+++ wayland-1.11.0/debian/control
@@ -12,6 +12,7 @@
  libexpat1-dev,
  libffi-dev,
  libxml2-dev,
+ libwayland-bin ,
 Build-Depends-Indep:
  doxygen,
  graphviz,
diff -u wayland-1.11.0/debian/rules wayland-1.11.0/debian/rules
--- wayland-1.11.0/debian/rules
+++ wayland-1.11.0/debian/rules
@@ -4,9 +4,16 @@
 
 BUILD_DOC=
 
+ifneq (,$(filter cross,$(DEB_BUILD_PROFILES)))
+configure_flags += --with-host-scanner
+endif
 # Don't build the documentation when not building arch:all packages
-override_dh_auto_configure-arch:
-   dh_auto_configure -- --disable-documentation
+ifeq (,$(filter libwayland-doc,$(shell dh_listpackages)))
+configure_flags += --disable-documentation
+endif
+
+override_dh_auto_configure:
+   dh_auto_configure -- $(configure_flags)
 
 # Kill *.la files, and forget no-one:
 override_dh_install: