[med-svn] [Git][med-team/fastml][master] 2 commits: Description: Enable cross building

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / fastml


Commits:
67bfe751 by Andreas Tille at 2019-07-30T14:01:15Z
Description: Enable cross building

- - - - -
bfcf8927 by Andreas Tille at 2019-07-30T14:05:24Z
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/cross.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+fastml (3.11-2) unstable; urgency=medium
+
+  * Description: Enable cross building
+    Closes: #933405
+
+ -- Andreas Tille <tille at debian.org>  Tue, 30 Jul 2019 16:01:25 +0200
+
 fastml (3.11-1) unstable; urgency=medium
 
   [ Jelmer Vernooij ]


=====================================
debian/patches/cross.patch
=====================================
@@ -0,0 +1,30 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Date: Tue, 30 Jul 2019 15:09:13 +0200
+Bug-Debian: https://bugs.debian.org/933405
+Description: Enable cross building
+ fastml fails to cross build from source, because it uses both CC and CXX
+ for a C++ compiler, but dh_auto_build passes a C compiler for CC. The
+ use is kinda implicit via builtin make rules. The attached patch makes
+ the relevant rule explicit and thus removes the use of CC to make fastml
+ cross buildable. Please consider applying it.
+
+--- a/programs/Makefile.generic
++++ b/programs/Makefile.generic
+@@ -17,9 +17,7 @@ DOUBLEREPLIB = $(LIB:.a=DoubleRep.a)
+ 
+ all: lib $(EXEC)
+ 
+-#CC=g++
+ CXX=g++
+-CC=$(CXX)
+ 
+ libDir=../../libs/phylogeny
+ binDir=../../bin
+@@ -112,6 +110,7 @@ endif
+ #$(EXEC) $(TEST_EXEC): $(LIB) #$(EVOLLIB)
+ #$(EXEC) $(TEST_EXEC): $(LIB) $(EVOLLIB)
+ $(EXEC) $(TEST_EXEC): $(LocalLib) $(libEvol)
++	$(CXX) $(LDFLAGS) $^ -o $@
+ $(DEBUGEXEC) $(TEST_EXEC): $(DEBUGLIB) $(libEvolDebug)
+ 
+ tests: $(TEST_EXEC) $(EXEC)


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ spelling.patch
 change_to_tests_dir_only_if_existing.patch
 skip_failing_tests.patch
 remove-template-depth.patch
+cross.patch



View it on GitLab: https://salsa.debian.org/med-team/fastml/compare/7f4a7583103e9f0ec7b662808a086a88db8164fa...bfcf892774cb75a8e64f1536970335f51480dd03

-- 
View it on GitLab: https://salsa.debian.org/med-team/fastml/compare/7f4a7583103e9f0ec7b662808a086a88db8164fa...bfcf892774cb75a8e64f1536970335f51480dd03
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190730/3761f194/attachment-0001.html>