[med-svn] [Git][med-team/khmer][master] 2 commits: debian/patches/fix_non_x86_build: enable building on aarch64 and other non-x86 systems.

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch master at Debian Med / khmer


Commits:
f5cacd65 by Michael R. Crusoe at 2022-09-01T16:13:40+02:00
debian/patches/fix_non_x86_build: enable building on aarch64 and other non-x86 systems.

- - - - -
0e45a23e by Michael R. Crusoe at 2022-09-01T16:14:43+02:00
routine-update: Ready to upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/fix_non_x86_build
- + debian/patches/hardening
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+khmer (3.0.0~a3+dfsg-2) unstable; urgency=medium
+
+  * debian/patches/fix_non_x86_build: enable building on aarch64 and
+    other non-x86 systems.
+  * debian/patches/hardening: Restore standard build flags into third-
+    party/cqf.
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Thu, 01 Sep 2022 16:14:43 +0200
+
 khmer (3.0.0~a3+dfsg-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/patches/fix_non_x86_build
=====================================
@@ -0,0 +1,13 @@
+From: Michael R. Crusoe <crusoe at debian.org>
+Subject: enable building on aarch64 and other non-x86 systems
+--- khmer.orig/third-party/cqf/Makefile
++++ khmer/third-party/cqf/Makefile
+@@ -31,7 +31,7 @@
+ CC = g++ -std=c++11 -fPIC
+ LD= g++ -std=c++11
+ 
+-CXXFLAGS = -Wall $(DEBUG) $(PROFILE) $(OPT) $(ARCH) -m64 -I. -Wno-unused-result -Wno-strict-aliasing -Wno-unused-function
++CXXFLAGS = -Wall $(DEBUG) $(PROFILE) $(OPT) $(ARCH) -I. -Wno-unused-result -Wno-strict-aliasing -Wno-unused-function
+ 
+ LDFLAGS = $(DEBUG) $(PROFILE) $(OPT) -lpthread -lssl -lcrypto -lm
+ 


=====================================
debian/patches/hardening
=====================================
@@ -0,0 +1,19 @@
+From: Michael R. Crusoe <crusoe at debian.org>
+Subject: Restore standard build flags into third-party/cqf
+
+Improves build hardening for Debian
+--- khmer.orig/third-party/cqf/Makefile
++++ khmer/third-party/cqf/Makefile
+@@ -55,10 +55,10 @@
+ #
+ 
+ %.o: %.cc
+-	$(CXX) $(CXXFLAGS) $(INCLUDE) $< -c -o $@
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $< -c -o $@
+ 
+ %.o: %.c
+-	$(CC) $(CXXFLAGS) $(INCLUDE) $< -c -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDE) $< -c -o $@
+ 
+ clean:
+ 	rm -f *.o $(TARGETS)


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,5 @@
+fix_non_x86_build
+hardening
 update-manifest
 setup-py-py3
 local-libs



View it on GitLab: https://salsa.debian.org/med-team/khmer/-/compare/2452d75080e0112882f737aa7c8f283777a3cd24...0e45a23e48e93a939639af9e1bd0bc24a8cba367

-- 
View it on GitLab: https://salsa.debian.org/med-team/khmer/-/compare/2452d75080e0112882f737aa7c8f283777a3cd24...0e45a23e48e93a939639af9e1bd0bc24a8cba367
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/20220901/44f3843d/attachment-0001.htm>