Source: openclonk Version: 8.1-2 Tags: patch User: debian-cr...@lists.debian.org Usertags: ftcbfs Control: block -1 by 984274
openclonk fails to cross build from source, because it needs a native build pass to build c4group and import it during a cross build pass. The attached patch implements that, by running cmake in a separate build directory with reduced dependencies. The remaining required dependencies are duplicated with :native. With this patch, a cross build fails like #984274. Please consider applying the attached patch. Helmut
diff --minimal -Nru openclonk-8.1/debian/changelog openclonk-8.1/debian/changelog --- openclonk-8.1/debian/changelog 2021-01-03 22:24:57.000000000 +0100 +++ openclonk-8.1/debian/changelog 2021-10-18 19:19:59.000000000 +0200 @@ -1,3 +1,9 @@ +openclonk (8.1-3) UNRELEASED; urgency=medium + + * Fix FTCBFS: Pass -DIMPORT_NATIVE_TOOLS=path-to-native-build. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Mon, 18 Oct 2021 19:19:59 +0200 + openclonk (8.1-2) unstable; urgency=medium * Remove myself from Uploaders and orphan the package. diff --minimal -Nru openclonk-8.1/debian/clean openclonk-8.1/debian/clean --- openclonk-8.1/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ openclonk-8.1/debian/clean 2021-10-18 19:19:07.000000000 +0200 @@ -0,0 +1 @@ +build-native diff --minimal -Nru openclonk-8.1/debian/control openclonk-8.1/debian/control --- openclonk-8.1/debian/control 2021-01-03 22:24:57.000000000 +0100 +++ openclonk-8.1/debian/control 2021-10-18 19:19:59.000000000 +0200 @@ -2,7 +2,7 @@ Section: games Priority: optional Maintainer: Debian QA Group <packa...@qa.debian.org> -Build-Depends: debhelper (>= 10), cmake (>= 3.0.2), libx11-dev, libxxf86vm-dev, libxrandr-dev, libxpm-dev, libglew-dev (>= 1.5.6), libgl1-mesa-dev, libpng-dev, libsdl2-dev, libsdl2-mixer-dev, libgtk-3-dev, qtbase5-dev, libjpeg-dev, zlib1g-dev, libupnp-dev, libfreetype6-dev, libboost-regex-dev, imagemagick, libtinyxml-dev, libopenal-dev, libalut-dev, libgtest-dev, libb2-dev +Build-Depends: debhelper (>= 10), cmake (>= 3.0.2), libx11-dev, libxxf86vm-dev, libxrandr-dev, libxpm-dev, libglew-dev (>= 1.5.6), libgl1-mesa-dev, libpng-dev, libpng-dev:native, libsdl2-dev, libsdl2-mixer-dev, libgtk-3-dev, qtbase5-dev, libjpeg-dev, libjpeg-dev:native, zlib1g-dev, zlib1g-dev:native, libupnp-dev, libfreetype6-dev, libboost-regex-dev, imagemagick, libtinyxml-dev, libopenal-dev, libalut-dev, libgtest-dev, libb2-dev Standards-Version: 4.1.3 Rules-Requires-Root: no Homepage: https://www.openclonk.org diff --minimal -Nru openclonk-8.1/debian/rules openclonk-8.1/debian/rules --- openclonk-8.1/debian/rules 2021-01-03 22:24:57.000000000 +0100 +++ openclonk-8.1/debian/rules 2021-10-18 19:19:59.000000000 +0200 @@ -12,7 +12,13 @@ endif override_dh_auto_configure: +ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) + dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure --builddirectory=build-native -- -DHEADLESS_ONLY=ON + dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_build --builddirectory=build-native -- c4group + dh_auto_configure -- $(CONFIG_ARGS) -DIMPORT_NATIVE_TOOLS=../build-native/NativeToolsExport.cmake +else dh_auto_configure -- $(CONFIG_ARGS) +endif override_dh_strip: dh_strip --dbgsym-migration='openclonk-dbg (<< 8.0-1~)'