Fix passing of hardening flags in CXXFLAGS instead of CPPFLAGS

3e830b57 · Graham Inggs · 393c6e13 · 3e830b57
Commit 3e830b57 authored 7 years ago by Graham Inggs
--- a/debian/patches/drop_march_option.patch
+++ b/debian/patches/drop_march_option.patch
-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@debian.org>
-Last-Update: Thu, 14 Dec 2017 09:50:02 +0100
+Author: Graham Inggs <ginggs@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