[Reproducible-commits] [discount] 84/121: Refresh 01_honour-build-flags.patch

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/reproducible_builds
in repository discount.

commit 4313d1a86697161c7ce9d42daee6b0eae41145ad
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Wed Aug 8 21:13:14 2012 +0200

    Refresh 01_honour-build-flags.patch
---
 debian/patches/01_honour-build-flags.patch | 32 +++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/debian/patches/01_honour-build-flags.patch b/debian/patches/01_honour-build-flags.patch
index c06d88d..3fabb26 100644
--- a/debian/patches/01_honour-build-flags.patch
+++ b/debian/patches/01_honour-build-flags.patch
@@ -7,31 +7,39 @@ Last-Update: 2012-06-03
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -75,17 +75,17 @@
+@@ -76,23 +76,23 @@
  
  # example programs
  @THEME at theme:  theme.o $(MKDLIB) mkdio.h
-- at THEME@	$(CC) -o theme theme.o -lmarkdown @LIBS@
-+ at THEME@	$(CC) $(CFLAGS) $(LDFLAGS) -o theme theme.o -lmarkdown @LIBS@
+- at THEME@	$(CC) $(LFLAGS) -o theme theme.o pgm_options.o -lmarkdown @LIBS@
++ at THEME@	$(CC) $(CFLAGS) $(LFLAGS) $(LDFLAGS) -o theme theme.o pgm_options.o -lmarkdown @LIBS@
  
  
  mkd2html:  mkd2html.o $(MKDLIB) mkdio.h
--	$(CC) -o mkd2html mkd2html.o -lmarkdown @LIBS@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
+-	$(CC) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
++	$(CC) $(CFLAGS) $(LFLAGS) $(LDFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
  
  markdown: main.o pgm_options.o $(MKDLIB)
--	$(CC) $(CFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
+-	$(CC) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
++	$(CC) $(CFLAGS) $(LFLAGS) $(LDFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
  	
  makepage:  makepage.c pgm_options.o $(MKDLIB) mkdio.h
--	$(CC) $(CFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
+-	$(CC) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
++	$(CC) $(CFLAGS) $(LFLAGS) $(LDFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
  
  pgm_options.o: pgm_options.c mkdio.h config.h
- 	$(CC) -I. -c pgm_options.c
+-	$(CC) -I. -c pgm_options.c
++	$(CC) $(CFLAGS) -I. -c pgm_options.c
+ 
+ main.o: main.c mkdio.h config.h
+-	$(CC) -I. -c main.c
++	$(CC) $(CFLAGS) -I. -c main.c
+ 
+ $(MKDLIB): $(OBJS)
+ 	./librarian.sh make $(MKDLIB) VERSION $(OBJS)
 --- a/configure.inc
 +++ b/configure.inc
-@@ -401,23 +401,15 @@
+@@ -403,23 +403,15 @@
  
  	if [ "$CFLAGS" ]; then
  	    test "$CFLAGS" && echo "validating CFLAGS=${CFLAGS}"
@@ -59,7 +67,7 @@ Last-Update: 2012-06-03
  	else
  	    AC_LDFLAGS=${CFLAGS:-"-g"}
  	fi
-@@ -1251,7 +1243,7 @@
+@@ -1282,7 +1274,7 @@
  FULLNAME=\$LIBNAME.\$VERSION
  
  case "\$ACTION" in

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