[med-svn] [Git][med-team/mapsembler2][master] 5 commits: make mapsembler2 cross buildable
Étienne Mollier
gitlab at salsa.debian.org
Mon Nov 9 14:33:41 GMT 2020
Étienne Mollier pushed to branch master at Debian Med / mapsembler2
Commits:
2188b12a by Helmut Grohne at 2020-11-09T14:35:09+01:00
make mapsembler2 cross buildable
- - - - -
cd852b70 by Étienne Mollier at 2020-11-09T14:45:22+01:00
cross.patch: dep3 header
- - - - -
703d70c7 by Étienne Mollier at 2020-11-09T14:55:04+01:00
list supported autopkgtest architectures
- - - - -
fe5bd9f7 by Étienne Mollier at 2020-11-09T14:56:06+01:00
add myself to uploaders
- - - - -
da22ddf0 by Étienne Mollier at 2020-11-09T15:13:27+01:00
routine-update: Ready to upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/cross.patch
- debian/patches/series
- debian/rules
- debian/tests/control
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+mapsembler2 (2.2.4+dfsg1-3) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Helmut Grohne ]
+ * Fix FTCBFS: (Closes: #972807)
+ + Let dh_auto_* handle cross compilation.
+ + cross.patch: Use CXX for a C++ compiler.
+
+ [ Étienne Mollier ]
+ * List supported autopkgtest architectures, no 32 bit anymore.
+ * Add myself to uploaders.
+
+ -- Étienne Mollier <etienne.mollier at mailoo.org> Mon, 09 Nov 2020 15:11:41 +0100
+
mapsembler2 (2.2.4+dfsg1-2) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -1,7 +1,8 @@
Source: mapsembler2
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Olivier Sallou <osallou at debian.org>,
- Andreas Tille <tille at debian.org>
+ Andreas Tille <tille at debian.org>,
+ Étienne Mollier <etienne.mollier at mailoo.org>
Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
=====================================
debian/patches/cross.patch
=====================================
@@ -0,0 +1,81 @@
+Description: mapsembler2 FTCBFS: multiple reasons
+ mapsembler2 fails to cross build from source, because it builds for the
+ build architecture. It does not pass any cross flags to cmake nor any
+ cross tools to make. In general, these kind of issues can often be
+ solved using dh_auto_*. In this case, that mostly does the trick except
+ for one aspect. Some makefiles use CC to store a C++ compiler. During
+ cross compilation, dh_auto_build passes a C compiler via CC and that
+ doesn't go well. I recommend changing the variable name to CXX, which is
+ what everyone uses.
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=972807
+Forwarded: no
+Reviewed-by: Étienne Mollier <etienne.mollier at mailoo.org>
+Last-Update: 2020-11-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- mapsembler2-2.2.4+dfsg1.orig/mapsembler2_extend/makefile
++++ mapsembler2-2.2.4+dfsg1/mapsembler2_extend/makefile
+@@ -1,14 +1,14 @@
+-CC=g++
++CXX=g++
+ EXEC=mapsembler_extend
+
+ #CFLAGS= -O4 -lz
+ #CFLAGS= -g -lz
+ #CFLAGS= -g -lz
+ CFLAGS= -O3 -lz
+-ifeq "$(CC)" "g++"
++ifeq "$(CXX)" "g++"
+ empty:=
+ space:= $(empty) $(empty)
+- GCCVERSIONSTRING := $(shell expr `$(CC) -dumpversion`)
++ GCCVERSIONSTRING := $(shell expr `$(CXX) -dumpversion`)
+ #Create version number without "."
+ GCCVERSION := $(shell expr `echo $(GCCVERSIONSTRING)` | cut -f1 -d.)
+ GCCVERSION += $(shell expr `echo $(GCCVERSIONSTRING)` | cut -f2 -d.)
+@@ -30,7 +30,7 @@
+ else
+ empty:=
+ space:= $(empty) $(empty)
+- CLANGVERSIONSTRING := $(shell expr `$(CC) -dumpversion`)
++ CLANGVERSIONSTRING := $(shell expr `$(CXX) -dumpversion`)
+ #Create version number without "."
+ CLANGVERSION := $(shell expr `echo $(GCCVERSIONSTRING)` | cut -f1 -d.)
+ CLANGVERSION += $(shell expr `echo $(GCCVERSIONSTRING)` | cut -f2 -d.)
+@@ -110,10 +110,10 @@
+
+ mapsembler_extend: $(OBJ) $(OBJ2) mapsembler_extend.cpp
+ #mapsembler: $(OBJ) $(OBJ2) test.cpp
+- $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
++ $(CXX) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+
+ %.o: %.cpp %.h
+- $(CC) -o $@ -c $< $(CFLAGS)
++ $(CXX) -o $@ -c $< $(CFLAGS)
+
+
+ #%.o: %.c %.h
+--- mapsembler2-2.2.4+dfsg1.orig/kissreads_graph/makefile
++++ mapsembler2-2.2.4+dfsg1/kissreads_graph/makefile
+@@ -1,5 +1,5 @@
+-#CC=/opt/local/bin/g++-mp-4.7
+-CC=g++
++#CXX=/opt/local/bin/g++-mp-4.7
++CXX=g++
+ EXEC=kissreads_graph
+ #Loader.cpp
+ CFLAGS= -O3 -L../thirdparty/zlib/build -lz -DMINIA_IS_IN_PARENT_FOLDER
+@@ -52,10 +52,10 @@
+ all: $(EXEC)
+
+ kissreads_graph: $(OBJ) KissReadsGraph.cpp
+- $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
++ $(CXX) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+
+ %.o: %.cpp %.h
+- $(CC) -o $@ -c $< $(CFLAGS)
++ $(CXX) -o $@ -c $< $(CFLAGS)
+
+
+
=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@ spelling.patch
no_std_hash_redefinition.patch
gcc10.patch
check_memory.patch
+cross.patch
=====================================
debian/rules
=====================================
@@ -23,12 +23,11 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
dh $@
override_dh_auto_build:
- mkdir mapsembler2_extremities/build
- cd mapsembler2_extremities/build && cmake .. && make VERBOSE=true
- cd mapsembler2_extend && make k=29
- cd kissreads_graph && make k=29
- cd kissreads && make k=29
-
+ dh_auto_configure --sourcedirectory=mapsembler2_extremities --builddirectory=mapsembler2_extremities/build
+ dh_auto_build --sourcedirectory=mapsembler2_extremities --builddirectory=mapsembler2_extremities/build
+ dh_auto_build --sourcedirectory=mapsembler2_extend -- k=29
+ dh_auto_build --sourcedirectory=kissreads_graph -- k=29
+ dh_auto_build --sourcedirectory=kissreads -- k=29
override_dh_clean:
rm -rf mapsembler2_extremities/build
=====================================
debian/tests/control
=====================================
@@ -1,3 +1,4 @@
Tests: run-unit-test
Depends: @
Restrictions: allow-stderr
+Architecture: amd64 arm64 kfreebsd-amd64 ppc64el s390x
View it on GitLab: https://salsa.debian.org/med-team/mapsembler2/-/compare/960ed6f68154dab05ddfcb83328a3cb15fa9a99d...da22ddf0148215b0ebe8e09427818cf7a9b60ca0
--
View it on GitLab: https://salsa.debian.org/med-team/mapsembler2/-/compare/960ed6f68154dab05ddfcb83328a3cb15fa9a99d...da22ddf0148215b0ebe8e09427818cf7a9b60ca0
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/20201109/9b31d36b/attachment-0001.html>
More information about the debian-med-commit
mailing list