Source: moria
Version: 5.7.10+20181022-2
Tags: patch
User: [email protected]
Usertags: rebootstrap

moria fails to cross build from source, because the cmake invocation
lacks the cross flags. The easiest way to add them is using
dh_auto_configure. Even then, moria fails to cross build, because the
upstream CMakeLists.txt hard codes the build architecture C++ compiler
(for no good reason). Removing that hardcoding makes it cross buildable.
Please consider applying the attached patch.

Helmut
diff --minimal -Nru moria-5.7.10+20181022/debian/changelog 
moria-5.7.10+20181022/debian/changelog
--- moria-5.7.10+20181022/debian/changelog      2019-01-06 21:28:22.000000000 
+0100
+++ moria-5.7.10+20181022/debian/changelog      2019-01-28 19:32:46.000000000 
+0100
@@ -1,3 +1,12 @@
+moria (5.7.10+20181022-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS, closes: #-1.
+    + Let dh_auto_configure pass cross flags to cmake.
+    + cross.patch: Don't force the build architecture compiler.
+
+ -- Helmut Grohne <[email protected]>  Mon, 28 Jan 2019 19:32:46 +0100
+
 moria (5.7.10+20181022-2) unstable; urgency=medium
 
   * Remove -Werror to allow build on mips64el, closes: #916030.
diff --minimal -Nru moria-5.7.10+20181022/debian/patches/cross.patch 
moria-5.7.10+20181022/debian/patches/cross.patch
--- moria-5.7.10+20181022/debian/patches/cross.patch    1970-01-01 
01:00:00.000000000 +0100
+++ moria-5.7.10+20181022/debian/patches/cross.patch    2019-01-28 
19:32:46.000000000 +0100
@@ -0,0 +1,10 @@
+--- moria-5.7.10+20181022.orig/CMakeLists.txt
++++ moria-5.7.10+20181022/CMakeLists.txt
+@@ -20,7 +20,6 @@
+ endif ()
+ 
+ # Compiler settings (this must come before calling project)
+-set(CMAKE_CXX_COMPILER g++)
+ set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD_REQUIRED on)
+ 
diff --minimal -Nru moria-5.7.10+20181022/debian/patches/series 
moria-5.7.10+20181022/debian/patches/series
--- moria-5.7.10+20181022/debian/patches/series 2019-01-06 21:28:22.000000000 
+0100
+++ moria-5.7.10+20181022/debian/patches/series 2019-01-28 19:32:46.000000000 
+0100
@@ -2,3 +2,4 @@
 set-data-path.patch
 dont-reopen-scores-file.patch
 remove-werror.patch
+cross.patch
diff --minimal -Nru moria-5.7.10+20181022/debian/rules 
moria-5.7.10+20181022/debian/rules
--- moria-5.7.10+20181022/debian/rules  2018-10-22 21:35:10.000000000 +0200
+++ moria-5.7.10+20181022/debian/rules  2019-01-28 19:32:44.000000000 +0100
@@ -6,7 +6,7 @@
 
 
 override_dh_auto_configure:
-       cmake .
+       dh_auto_configure --builddirectory=.
 
 override_dh_auto_install:
 

Reply via email to