[med-svn] [subread] 01/01: Fix build on armel, armhf, arm64 and ppc64el

[Alex Mestiashvili]

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

malex-guest pushed a commit to tag debian/1.5.0-p2+dfsg-2
in repository subread.

commit 92426ae551cb48bf560af12aedd063f0adf7bad9
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Tue Apr 26 21:31:35 2016 +0200

    Fix build on armel, armhf, arm64 and ppc64el
    
    Update d/rules and move -fsigned-char to the arch_specific_flags.patch
    as it seem to be important to have this flag in the beginning of
    CFLAGS on architectures with unsigned char signedness
---
 debian/patches/arch_specific_flags.patch | 16 +++++++++-------
 debian/rules                             |  1 -
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/patches/arch_specific_flags.patch b/debian/patches/arch_specific_flags.patch
index f64a140..5444435 100644
--- a/debian/patches/arch_specific_flags.patch
+++ b/debian/patches/arch_specific_flags.patch
@@ -1,9 +1,11 @@
-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
- Append CFLAGS and LDFLAGS instead of hardcoding the values,
- this way the hardening flags are set correctly
+Description: Inject architecture specific flags:
+ - For amd64 and i386 add -mtune=generic and -msse3,
+ - use -fsigned-char for all architectures and place it in the very beginning
+   of CFLAGS, otherwise test fail on architecrures with unsigned char 
+   signedness
+ - 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
@@ -16,7 +18,7 @@ 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 += -O${OPT_LEVEL} -Wall  -DMAKE_FOR_EXON  -D MAKE_STANDALONE -D SUBREAD_VERSION=\"${SUBREAD_VERSION}\"  -D_FILE_OFFSET_BITS=64
++CCFLAGS += -O${OPT_LEVEL} -fsigned-char -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
  
diff --git a/debian/rules b/debian/rules
index 0cb577c..a603794 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ endif
 ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
         CFLAGS += -D KFREEBSD
 endif
-CFLAGS += -fsigned-char
 
 %:
 	dh $@ --parallel

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