[med-svn] [patman] 01/04: Fix passing of hardening flags in CXXFLAGS instead of CPPFLAGS

[Graham Inggs]

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

ginggs pushed a commit to branch master
in repository patman.

commit 3e830b572446d24e7163cb183d30e2ce402976bb
Author: Graham Inggs <ginggs at debian.org>
Date:   Thu Dec 21 15:59:15 2017 +0200

    Fix passing of hardening flags in CXXFLAGS instead of CPPFLAGS
---
 debian/patches/drop_march_option.patch | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/debian/patches/drop_march_option.patch b/debian/patches/drop_march_option.patch
index d3c2555..5e2478f 100644
--- a/debian/patches/drop_march_option.patch
+++ b/debian/patches/drop_march_option.patch
@@ -1,16 +1,36 @@
-Description: Drop -march=k8 from build options
+Description: Makefile fixes
+ Drop -march=k8 from build options
+ Fix passing of hardening flags in CXXFLAGS
+ instead of CPPFLAGS, fixes FTBFS on X32
 Bug-Debian: https://bugs.debian.org/884342
+Bug-Debian: https://bugs.debian.org/884795
 Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 14 Dec 2017 09:50:02 +0100
+Author: Graham Inggs <ginggs at debian.org>
+Last-Update: 2017-12-21
 
 --- a/Makefile
 +++ b/Makefile
-@@ -12,7 +12,7 @@ version := 1.2
+@@ -11,18 +11,18 @@
+ 
  TARGETS := patman
  OBJS := prefix_tree.o fasta.o main.o
- CPPFLAGS += -Wall 
+-CPPFLAGS += -Wall 
 -CPPFLAGS += -O3 -funroll-loops -DNDEBUG -march=k8
-+CPPFLAGS += -O3 -funroll-loops -DNDEBUG
- # CPPFLAGS += -ggdb
+-# CPPFLAGS += -ggdb
++CXXFLAGS += -Wall
++CXXFLAGS += -O3 -funroll-loops -DNDEBUG
++# CXXFLAGS += -ggdb
  LDLIBS += -lpopt
  
+ all: $(TARGETS)
+ 
+ patman:	$(OBJS)
+-	g++ $(CPPFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LDLIBS)
++	g++ $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LDLIBS)
+ 
+ %.o:	%.cpp
+-	g++ -DVERSION="\"$(version)\"" $(CPPFLAGS) -c -o $@ $<
++	g++ -DVERSION="\"$(version)\"" $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+ 
+ install: $(TARGETS)
+ 	install -d ${prefix}/bin

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