[med-svn] [Git][med-team/lighter][master] Propagate hardening options

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / lighter


Commits:
8cdccd4b by Andreas Tille at 2020-05-27T22:34:28+02:00
Propagate hardening options

- - - - -


3 changed files:

- + debian/patches/hardening.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/patches/hardening.patch
=====================================
@@ -0,0 +1,23 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 27 May 2020 15:51:30 +0200
+Description: Propagate hardening options
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-CXX = g++
+-CXXFLAGS= -Wall -O3
++CXX?= g++
++CXXFLAGS+= -Wall -O3
+ LINKFLAGS = -lpthread -lz 
+ DEBUG=
+ OBJECTS = ErrorCorrection.o GetKmers.o
+@@ -12,7 +12,7 @@ endif
+ all: lighter
+ 
+ lighter: main.o $(OBJECTS)
+-	$(CXX) -o $@ $(CXXFLAGS) $(OBJECTS) main.o $(LINKFLAGS)
++	$(CXX) -o $@ $(CXXFLAGS) $(OBJECTS) main.o $(LINKFLAGS) $(LDFLAGS)
+ 
+ main.o: main.cpp utils.h Reads.h Store.h File.h KmerCode.h bloom_filter.hpp
+ ErrorCorrection.o: ErrorCorrection.cpp ErrorCorrection.h utils.h


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+hardening.patch


=====================================
debian/rules
=====================================
@@ -1,21 +1,7 @@
 #!/usr/bin/make -f
 
 # DH_VERBOSE := 1
-export LC_ALL=C.UTF-8
-
-include /usr/share/dpkg/default.mk
-# this provides:
-# DEB_SOURCE: the source package name
-# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision)
-# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision
-# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch
-# DEB_VERSION_UPSTREAM: the package's upstream version
-# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
-# SOURCE_DATE_EPOCH: the source release date as seconds since the epoch, as
-#                    specified by <https://reproducible-builds.org/specs/source-date-epoch/>
-
-# for hardening you might like to uncomment this:
-# export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@
@@ -25,7 +11,3 @@ include /usr/share/dpkg/default.mk
 #ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 #	do_stuff_for_testing
 #endif
-
-### If you **really** can not use uscan (even not with mode=git) use a debian/get-orig-script
-#get-orig-source:
-#	. debian/get-orig-source



View it on GitLab: https://salsa.debian.org/med-team/lighter/-/commit/8cdccd4b023e2f0c023895b58e4298a609d116ba

-- 
View it on GitLab: https://salsa.debian.org/med-team/lighter/-/commit/8cdccd4b023e2f0c023895b58e4298a609d116ba
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/20200527/ac58fd1b/attachment-0001.html>