[med-svn] [Git][med-team/roguenarok][master] 2 commits: Propagate hardening CPPFLAGS, avoid FTBFS with -Wl, --as-needed

[Graham Inggs]

Graham Inggs pushed to branch master at Debian Med / roguenarok


Commits:
8d87a2f0 by Graham Inggs at 2018-08-29T09:55:19Z
Propagate hardening CPPFLAGS, avoid FTBFS with -Wl,--as-needed

- - - - -
07384bbf by Graham Inggs at 2018-08-29T10:06:40Z
Prepare for upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/patches/hardening.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+roguenarok (1.0-3) unstable; urgency=medium
+
+  * Team upload
+  * Propagate hardening CPPFLAGS
+  * Avoid FTBFS when linking with -Wl,--as-needed
+
+ -- Graham Inggs <ginggs at debian.org>  Wed, 29 Aug 2018 10:06:06 +0000
+
 roguenarok (1.0-2) unstable; urgency=medium
 
   * debhelper 11


=====================================
debian/patches/hardening.patch
=====================================
@@ -1,6 +1,9 @@
+Description: Propagate hardening options
+ and avoid FTBFS when linking with -Wl,--as-needed
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Mon, 13 Mar 2017 11:13:16 +0100
-Description: Propagate hardening options
+Author: Graham Inggs <ginggs at debian.org>
+Last-Update: 2017-05-01
 
 --- a/Makefile
 +++ b/Makefile
@@ -10,34 +13,56 @@ Description: Propagate hardening options
 -CFLAGS = -Wall -D_GNU_SOURCE # -DNDEBUG
 -LFLAGS = -lm
 +CFLAGS += -Wall -D_GNU_SOURCE # -DNDEBUG
-+LFLAGS += -lm
++LIBS += -lm
  
  ifeq ($(mode), debug)
   CFLAGS += -g
-@@ -33,20 +33,20 @@ mast-objs = rnr-mast.o common.o List.o T
+@@ -12,12 +12,12 @@
+ endif
+ endif
+ ifeq ($(mode), parallel)
+-CFLAGS += -DPARALLEL -DPORTABLE_PTHREADS 
+-LFLAGS += -pthread 
++CFLAGS += -DPARALLEL -DPORTABLE_PTHREADS
++LDFLAGS += -pthread
+ endif
+ ifeq ($(mode), parallelDebug)
+ CFLAGS += -DPARALLEL -g
+-LFLAGS += -pthread 
++LDFLAGS += -pthread
+ endif
+ 
+ RM = rm -fr
+@@ -33,25 +33,24 @@
  prune-objs = rnr-prune.o common.o Tree.o BitVector.o HashTable.o  legacy.o newFunctions.o List.o
  
  rnr-lsi: $(lsi-objs)
 -	$(CC) $(LFLAGS) -o $@   $^ $(CFLAGS)
-+	$(CC) $(LFLAGS) -o $@   $^ $(CFLAGS) $(LDFLAGS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@   $^ $(LIBS)
  rnr-tii: $(tii-objs)
 -	$(CC) $(LFLAGS) -o $@   $^ $(CFLAGS)
-+	$(CC) $(LFLAGS) -o $@   $^ $(CFLAGS) $(LDFLAGS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@   $^ $(LIBS)
  rnr-mast: $(mast-objs)
 -	$(CC) $(LFLAGS) -o $@   $^ $(CFLAGS)
-+	$(CC) $(LFLAGS) -o $@   $^ $(CFLAGS) $(LDFLAGS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@   $^ $(LIBS)
  rnr-prune: $(prune-objs)
 -	$(CC) $(LFLAGS) -o $@   $^ $(CFLAGS)
-+	$(CC) $(LFLAGS) -o $@   $^ $(CFLAGS) $(LDFLAGS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@   $^ $(LIBS)
  
  ifeq ($(mode),parallel)
  RogueNaRok: $(rnr-objs)
 -	$(CC) $(LFLAGS) -o $@-parallel   $^ $(CFLAGS)
-+	$(CC) $(LFLAGS) -o $@-parallel   $^ $(CFLAGS) $(LDFLAGS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@-parallel   $^ $(LIBS)
  else
  RogueNaRok: $(rnr-objs)
 -	$(CC) $(LFLAGS) -o $@   $^ $(CFLAGS)
-+	$(CC) $(LFLAGS) -o $@   $^ $(CFLAGS) $(LDFLAGS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@   $^ $(LIBS)
  endif
  
  %.o : %.c $(DEPS)
+-	$(CC) -c -o $@ $< $(CFLAGS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+ 
+ clean : 
+ 	$(RM) $(rnr-objs) $(lsi-objs) $(tii-objs) $(mast-objs) $(prune-objs) $(TARGETS)  $(TESTS) $(rnr-test-objs) RogueNaRok-parallel
+-



View it on GitLab: https://salsa.debian.org/med-team/roguenarok/compare/15aca9ae34f6823666e6ea1b954ae55220c7173d...07384bbf4eb2d7958b2780717bc5b6e70db5b0ed

-- 
View it on GitLab: https://salsa.debian.org/med-team/roguenarok/compare/15aca9ae34f6823666e6ea1b954ae55220c7173d...07384bbf4eb2d7958b2780717bc5b6e70db5b0ed
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180829/d49990ed/attachment-0001.html>