[Forensics-changes] [memdump] 10/12: Improve build flags support

[Raphaël Hertzog]

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

hertzog pushed a commit to branch debian
in repository memdump.

commit 2855db44ef3414e887adbab5e8127c9cdee71152
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Tue Jul 28 10:08:09 2015 +0200

    Improve build flags support
---
 debian/patches/03-build-flags-support.patch | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/patches/03-build-flags-support.patch b/debian/patches/03-build-flags-support.patch
index 751f0c5..5c6247e 100644
--- a/debian/patches/03-build-flags-support.patch
+++ b/debian/patches/03-build-flags-support.patch
@@ -8,7 +8,7 @@ Last-Update: 2015-07-28
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Makefile
 +++ b/Makefile
-@@ -1,9 +1,10 @@
+@@ -1,9 +1,13 @@
  SHELL	= /bin/sh
 -CC	= gcc -Wformat -Wunused
 +CC	= gcc
@@ -16,12 +16,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  DEBUG	= -g
  PROGS	= memdump
 -CFLAGS	= $(OPT) $(DEBUG) -I. $(XFLAGS) $(DEFS)
++ifneq ($(DEFS),)
++# Only complete variables once when we're called with make DEFS="something"
 +CPPFLAGS += -I. $(DEFS)
 +CFLAGS	+= -Wall -Wno-comment
++endif
  OBJS	= memdump.o convert_size.o error.o mymalloc.o
  PROGS	= memdump
  MAN	= memdump.1
-@@ -16,7 +17,7 @@ all:	$(PROGS)
+@@ -16,7 +20,7 @@ all:	$(PROGS)
  manpages: $(MAN)
  
  memdump:	$(OBJS)
@@ -30,3 +33,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  memdump.1: memdump.c
  	srctoman $? >$@
+--- a/makedefs
++++ b/makedefs
+@@ -40,5 +40,5 @@ esac
+ 
+ unset MAKELEVEL	# shut up chatty GNU make
+ 
+-make DEFS="$DEFS" CC="${CC-gcc -Wunused}" RANLIB="${RANLIB-ranlib}" \
++make DEFS="$DEFS" CC="${CC-gcc}" RANLIB="${RANLIB-ranlib}" \
+ 	AR="${AR-ar rv}" SYSLIBS="$SYSLIBS" all

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