[med-svn] [Git][med-team/diann][master] Try harder to build executable correctl

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / diann


Commits:
217fee69 by Andreas Tille at 2022-01-18T17:44:07+01:00
Try harder to build executable correctl

- - - - -


4 changed files:

- debian/install
- + debian/patches/fix_syntax.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/install
=====================================
@@ -1 +1 @@
-diann	usr/bin
+bin	usr


=====================================
debian/patches/fix_syntax.patch
=====================================
@@ -0,0 +1,14 @@
+Author: Andreas Tille <tille at debian.org>s
+Last-Update: Tue, 18 Jan 2022 14:59:21 +0100
+Description: Fix C++ syntax
+
+--- a/src/diann.cpp
++++ b/src/diann.cpp
+@@ -606,6 +606,7 @@ bool load_unimod() {
+ 		}
+ 	}
+ 	in.close();
++	return true;
+ }
+ 
+ void init_unimod() {


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 use_debian_packaged_eigen3.patch
+fix_syntax.patch


=====================================
debian/rules
=====================================
@@ -13,9 +13,13 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 # Options removed from ../linux-build-gcc-7: -static -msse2 -march=core2
 override_dh_auto_build:
-	$(CPP) $(CFLAGS) -o diann \
+	mkdir -p bin
+	# Does not build with option `-fstack-protector-strong` (--> needs -fpermissive for some goto statements)
+	g++ -Wformat -Werror=format-security -o bin/diann.o \
 		src/diann.cpp \
-		-Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++17 -lstdc++fs -fpermissive -O3 -mfpmath=sse -w \
-		-I/usr/include/libmstoolkit -lmstoolkitlite \
+		-std=c++17 -fpermissive -O3 -mfpmath=sse\
+		-I/usr/include/libmstoolkit \
 		-I/usr/include/eigen3 \
 		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DGCC -DHAVE_EXPAT_CONFIG_H
+	$(LD) -o bin/diann \
+		-lpthread -lstdc++fs -lmstoolkitlite # $(LDFLAGS)



View it on GitLab: https://salsa.debian.org/med-team/diann/-/commit/217fee6950d68b44f0d01ab291e830ecb04ddf3b

-- 
View it on GitLab: https://salsa.debian.org/med-team/diann/-/commit/217fee6950d68b44f0d01ab291e830ecb04ddf3b
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/20220118/0471af52/attachment-0001.htm>