[med-svn] r18634 - in trunk/packages/rna-star/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-01-30 06:22:37 +0000 (Fri, 30 Jan 2015)
New Revision: 18634

Modified:
   trunk/packages/rna-star/trunk/debian/patches/compilationstuff.patch
   trunk/packages/rna-star/trunk/debian/rules
Log:
Propagate hardening options


Modified: trunk/packages/rna-star/trunk/debian/patches/compilationstuff.patch
===================================================================
--- trunk/packages/rna-star/trunk/debian/patches/compilationstuff.patch	2015-01-30 06:00:26 UTC (rev 18633)
+++ trunk/packages/rna-star/trunk/debian/patches/compilationstuff.patch	2015-01-30 06:22:37 UTC (rev 18634)
@@ -23,7 +23,7 @@
 -LDFLAGS_static := -static -static-libgcc -pthread -Lhtslib -lhts -lz
 -LDFLAGS_Mac :=-pthread -lz htslib/libhts.a
 -LDFLAGS_Mac_static :=-pthread -lz -static-libgcc htslib/libhts.a
-+LDFLAGS += -pthread -lhts -lz
++LDFLAGS := -pthread -lhts -lz $(LDFLAGS_add)
 +LDFLAGS_static += -static -static-libgcc -pthread -Lhtslib -lhts -lz
 +LDFLAGS_Mac +=-pthread -lz htslib/libhts.a
 +LDFLAGS_Mac_static +=-pthread -lz -static-libgcc htslib/libhts.a

Modified: trunk/packages/rna-star/trunk/debian/rules
===================================================================
--- trunk/packages/rna-star/trunk/debian/rules	2015-01-30 06:00:26 UTC (rev 18633)
+++ trunk/packages/rna-star/trunk/debian/rules	2015-01-30 06:22:37 UTC (rev 18634)
@@ -8,13 +8,13 @@
 #include /usr/share/dpkg/buildflags.mk
 
 export CCFLAGS=-flto $(CXXFLAGS) $(CPPFLAGS) -std=c++0x
-export LDFLAGS+=-flto -pthread -lhts -lz
+# export LDFLAGS+=-flto -pthread -lhts -lz
 
 %:
 	dh $@ 
 
 override_dh_auto_build:
-	cd source && $(MAKE) CCFLAGS_common_add=-flto CCFLAGS="$(CCFLAGS)" LDFLAGS="$(LDFLAGS)"
+	cd source && $(MAKE) CCFLAGS_common_add="-flto $(CCFLAGS)" CCFLAGS="$(CCFLAGS)" LDFLAGS_add="$(LDFLAGS)"
 
 override_dh_auto_clean:
 	cd source && $(MAKE) clean