[med-svn] [subread] 08/14: Update arch_specific_flags.patch

[Alex Mestiashvili]

This is an automated email from the git hooks/post-receive script.

malex-guest pushed a commit to branch master
in repository subread.

commit ea05377e6d7ad24700d7fea7e4c9f1a516553092
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Sat Apr 23 09:44:27 2016 +0200

    Update arch_specific_flags.patch
    
    Append CFLAGS and LDFLAGS instead of hardcoding the values,
    this way the hardening flags are set correctly.
---
 debian/patches/arch_specific_flags.patch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/patches/arch_specific_flags.patch b/debian/patches/arch_specific_flags.patch
index 0ec3215..f4b7ae3 100644
--- a/debian/patches/arch_specific_flags.patch
+++ b/debian/patches/arch_specific_flags.patch
@@ -1,7 +1,9 @@
 Description: inject architecture specific flags:
  for amd64 and i386 add -mtune=generic and -msse3,
- use -fsigned-char for all architectures
- change -O9 to -O3 because -O levels higher than 3 have no effect
+ use -fsigned-char for all architectures.
+ Change -O9 to -O3 because -O levels higher than 3 have no effect
+ Append CFLAGS and LDFLAGS instead of hardcoding the values,
+ this way the hardening flags are set correctly
 Author: Alex Mestiashvili <alex at biotec.tu-dresden.de>
 --- subread.orig/src/Makefile.Linux
 +++ subread/src/Makefile.Linux
@@ -14,8 +16,8 @@ Author: Alex Mestiashvili <alex at biotec.tu-dresden.de>
 -LDFLAGS = ${STATIC_MAKE} -lpthread -lz -lm ${MACOS} -O${OPT_LEVEL} -DMAKE_FOR_EXON -D MAKE_STANDALONE # -DREPORT_ALL_THE_BEST
 -CC = gcc ${CCFLAGS} -ggdb -fomit-frame-pointer -ffast-math -funroll-loops -mmmx -msse -msse2 -msse3 -fmessage-length=0 
 +OPT_LEVEL = 3
-+CCFLAGS = ${EXTRA_CC_FLAGS} -O${OPT_LEVEL} -Wall  -DMAKE_FOR_EXON  -D MAKE_STANDALONE -D SUBREAD_VERSION=\"${SUBREAD_VERSION}\"  -D_FILE_OFFSET_BITS=64
-+LDFLAGS = ${STATIC_MAKE} -lpthread -lz -lm -O${OPT_LEVEL} -DMAKE_FOR_EXON -D MAKE_STANDALONE # -DREPORT_ALL_THE_BEST
++CCFLAGS += ${EXTRA_CC_FLAGS} -O${OPT_LEVEL} -Wall  -DMAKE_FOR_EXON  -D MAKE_STANDALONE -D SUBREAD_VERSION=\"${SUBREAD_VERSION}\"  -D_FILE_OFFSET_BITS=64
++LDFLAGS += ${STATIC_MAKE} -lpthread -lz -lm -O${OPT_LEVEL} -DMAKE_FOR_EXON -D MAKE_STANDALONE # -DREPORT_ALL_THE_BEST
 +CC = gcc ${CCFLAGS} -ggdb -fomit-frame-pointer -ffast-math -funroll-loops -fmessage-length=0
  
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/subread.git