Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Description: Enable cross building
· 67bfe751
Andreas Tille
authored
Jul 30, 2019
67bfe751
Upload to unstable
· bfcf8927
Andreas Tille
authored
Jul 30, 2019
bfcf8927
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
bfcf8927
fastml (3.11-2) unstable; urgency=medium
* Description: Enable cross building
Closes: #933405
-- Andreas Tille <tille@debian.org> Tue, 30 Jul 2019 16:01:25 +0200
fastml (3.11-1) unstable; urgency=medium
[ Jelmer Vernooij ]
...
...
debian/patches/cross.patch
0 → 100644
View file @
bfcf8927
From: Helmut Grohne <helmut@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
View file @
bfcf8927
...
...
@@ -5,3 +5,4 @@ spelling.patch
change_to_tests_dir_only_if_existing.patch
skip_failing_tests.patch
remove-template-depth.patch
cross.patch