Author: lkajan-guest Date: 2012-05-23 14:04:31 +0000 (Wed, 23 May 2012) New Revision: 10965
Added: trunk/packages/hhsuite/trunk/debian/patches/hardening Modified: trunk/packages/hhsuite/trunk/debian/changelog trunk/packages/hhsuite/trunk/debian/patches/series trunk/packages/hhsuite/trunk/debian/rules Log: hardening flags added Modified: trunk/packages/hhsuite/trunk/debian/changelog =================================================================== --- trunk/packages/hhsuite/trunk/debian/changelog 2012-05-23 13:46:09 UTC (rev 10964) +++ trunk/packages/hhsuite/trunk/debian/changelog 2012-05-23 14:04:31 UTC (rev 10965) @@ -1,4 +1,4 @@ -hhsuite (2.0.14-1) UNRELEASED; urgency=low +hhsuite (2.0.14-1) unstable; urgency=low * [Andreas Tille <[email protected]>] debian/upstream: Enhanced author values Added: trunk/packages/hhsuite/trunk/debian/patches/hardening =================================================================== --- trunk/packages/hhsuite/trunk/debian/patches/hardening (rev 0) +++ trunk/packages/hhsuite/trunk/debian/patches/hardening 2012-05-23 14:04:31 UTC (rev 10965) @@ -0,0 +1,29 @@ +Description: Hardening patch. +Author: Laszlo Kajan <[email protected]> +--- a/src/Makefile ++++ b/src/Makefile +@@ -14,13 +14,13 @@ + + ifdef ICC + CXX = env LANG=C icc +- CXXFLAGS = -fast -Wall -fno-strict-aliasing -finline-functions -funroll-loops -fp-model fast=2 -fast-transcendentals -wd981 -wd383 -wd2259 -wd1572 -D HH_SSE3 -I$(CS_DIR) ++ CXXFLAGS += -fast -Wall -fno-strict-aliasing -finline-functions -funroll-loops -fp-model fast=2 -fast-transcendentals -wd981 -wd383 -wd2259 -wd1572 -D HH_SSE3 -I$(CS_DIR) + HHSEARCH_LIBS = -lpthread -lrt + HHBLITS_LIBS = -lpthread -lrt -openmp + OBJECT_LIBS = -openmp + else # ifndef ICC + CXX = g++ +- CXXFLAGS = -O3 -Wall -Wno-deprecated -Wno-char-subscripts -fno-strict-aliasing -I$(CS_DIR) $(BITS_FLAG) ++ CXXFLAGS += -O3 -Wall -Wno-deprecated -Wno-char-subscripts -fno-strict-aliasing -I$(CS_DIR) $(BITS_FLAG) + HHSEARCH_LIBS = -lpthread + HHBLITS_LIBS = -lpthread -fopenmp + HHALIGN_LIBS = +@@ -51,7 +51,7 @@ + endif + endif # ifndef ICC + +-CPP = $(CXX) $(CXXFLAGS) ++CPP = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) + CPP_VALGRIND = $(CXX) -g $(CXXFLAGS) + + Modified: trunk/packages/hhsuite/trunk/debian/patches/series =================================================================== --- trunk/packages/hhsuite/trunk/debian/patches/series 2012-05-23 13:46:09 UTC (rev 10964) +++ trunk/packages/hhsuite/trunk/debian/patches/series 2012-05-23 14:04:31 UTC (rev 10965) @@ -2,3 +2,4 @@ paths help rest1 +hardening Modified: trunk/packages/hhsuite/trunk/debian/rules =================================================================== --- trunk/packages/hhsuite/trunk/debian/rules 2012-05-23 13:46:09 UTC (rev 10964) +++ trunk/packages/hhsuite/trunk/debian/rules 2012-05-23 14:04:31 UTC (rev 10965) @@ -1,5 +1,10 @@ #!/usr/bin/make -f +export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
