[med-svn] [Git][med-team/hmmer2][master] 2 commits: Propagate hardening options

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / hmmer2


Commits:
cbd04d13 by Andreas Tille at 2019-01-11T18:40:35Z
Propagate hardening options

- - - - -
d6aae46c by Andreas Tille at 2019-01-11T18:55:48Z
Try to create static library

- - - - -


3 changed files:

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


Changes:

=====================================
debian/patches/hardening.patch
=====================================
@@ -0,0 +1,28 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 11 Jan 2019 15:43:07 +0100
+Description: Propagate hardening options
+
+--- a/Makefile
++++ b/Makefile
+@@ -12,8 +12,8 @@ export MANDIR      = ${prefix}/share/man
+ export PROGSUFFIX = 2
+ export MANSUFFIX = 1
+ 
+-export CFLAGS = -pipe -Wall -Wextra -fPIC -O3
+-export LIBS   = -lm -pthread
++export CFLAGS += -pipe -Wall -Wextra -fPIC -O3
++export LIBS    = -lm -pthread
+ 
+ # The program lists below for HMMER are not necessarily
+ # a complete manifest. They are the list of stable programs that the
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -45,7 +45,7 @@ HDRS =	config.h\
+ all:	 $(PROGS)
+ 
+ ${PROGS}: %: %.o ${OBJS}
+-	${CC} ${CFLAGS} ${MYLIBDIR} -o $@ $@.o ${OBJS} ${MYLIBS} ${PTHREAD_LIBS} ${LIBS}
++	${CC} ${CFLAGS} ${MYLIBDIR} -o $@ $@.o ${OBJS} ${MYLIBS} ${PTHREAD_LIBS} ${LIBS} $(LDFLAGS)
+ 
+ 
+ #################################################################


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,5 @@ use_debian_packaged_biosquid.patch
 build_libhmmer.a_with-fPIC.patch
 fix_typo.patch
 fix_install.patch
+hardening.patch
+#static_lib.patch


=====================================
debian/patches/static_lib.patch
=====================================
@@ -0,0 +1,20 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 11 Jan 2019 15:43:07 +0100
+Description: Try to create static library
+ Unfortunately this does not work - thus the patch is deactivated
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -54,9 +54,9 @@ ${PROGS}: %: %.o ${OBJS}
+ module: $(HMMLIB)
+ 
+ $(HMMLIB): $(OBJS)
+-#	$(AR) libhmmer.a $(OBJS)
+-#	$(RANLIB) libhmmer.a
+-#	chmod 644 libhmmer.a
++	$(AR) libhmmer.a $(OBJS)
++	$(RANLIB) libhmmer.a
++	chmod 644 libhmmer.a
+ 	gcc -shared $(OBJS) -o $@
+ 
+ 



View it on GitLab: https://salsa.debian.org/med-team/hmmer2/compare/e8e828b135bc5fd7855253eea5e3ac3deb680306...d6aae46c87b1306f95e80e033411d66eb8e67f73

-- 
View it on GitLab: https://salsa.debian.org/med-team/hmmer2/compare/e8e828b135bc5fd7855253eea5e3ac3deb680306...d6aae46c87b1306f95e80e033411d66eb8e67f73
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/20190111/9c348583/attachment-0001.html>