[Reproducible-commits] [discount] 77/121: Add 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 7a14868b7cd388ce88855004f73d6913a894b23a
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Sun Jun 3 15:54:43 2012 +0200

    Add 01_honour-build-flags.patch
---
 debian/patches/01_honour-build-flags.patch | 70 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 2 files changed, 71 insertions(+)

diff --git a/debian/patches/01_honour-build-flags.patch b/debian/patches/01_honour-build-flags.patch
new file mode 100644
index 0000000..c06d88d
--- /dev/null
+++ b/debian/patches/01_honour-build-flags.patch
@@ -0,0 +1,70 @@
+Description: Always honour CFLAGS, CPPFLAGS and LDFLAGS
+Origin: vendor
+Forwarded: no
+Author: Alessandro Ghedini <ghedo at debian.org>
+Reviewed-by: Alessandro Ghedini <ghedo at debian.org>
+Last-Update: 2012-06-03
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -75,17 +75,17 @@
+ 
+ # 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@
+ 
+ 
+ mkd2html:  mkd2html.o $(MKDLIB) mkdio.h
+-	$(CC) -o mkd2html mkd2html.o -lmarkdown @LIBS@
++	$(CC) $(CFLAGS) $(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@
+ 	
+ 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@
+ 
+ pgm_options.o: pgm_options.c mkdio.h config.h
+ 	$(CC) -I. -c pgm_options.c
+--- a/configure.inc
++++ b/configure.inc
+@@ -401,23 +401,15 @@
+ 
+ 	if [ "$CFLAGS" ]; then
+ 	    test "$CFLAGS" && echo "validating CFLAGS=${CFLAGS}"
+-	    if $AC_CC $CFLAGS -o ngc$$.o ngc$$.c ; then
+-		AC_CFLAGS=${CFLAGS:-"-g"}
+-		test "$CFLAGS" && echo "CFLAGS=\"${CFLAGS}\" are okay"
+-	    elif [ "$CFLAGS" ]; then
+-		echo "ignoring bogus CFLAGS=\"${CFLAGS}\""
+-	    fi
++	    AC_CFLAGS=${CFLAGS:-"-g"}
++	    test "$CFLAGS" && echo "CFLAGS=\"${CFLAGS}\" are okay"
+ 	else
+ 	    AC_CFLAGS=-g
+ 	fi
+ 	if [ "$LDFLAGS" ]; then
+ 	    test "$LDFLAGS" && echo "validating LDFLAGS=${LDFLAGS}"
+-	    if $AC_CC $LDFLAGS -o ngc$$ ngc$$.o; then
+-		AC_LDFLAGS=${LDFLAGS:-"-g"}
+-		test "$LDFLAGS" && TLOG "LDFLAGS=\"${LDFLAGS}\" are okay"
+-	    elif [ "$LDFLAGS" ]; then
+-		TLOG "ignoring bogus LDFLAGS=\"${LDFLAGS}\""
+-	    fi
++	    AC_LDFLAGS=${LDFLAGS:-"-g"}
++	    test "$LDFLAGS" && TLOG "LDFLAGS=\"${LDFLAGS}\" are okay"
+ 	else
+ 	    AC_LDFLAGS=${CFLAGS:-"-g"}
+ 	fi
+@@ -1251,7 +1243,7 @@
+ FULLNAME=\$LIBNAME.\$VERSION
+ 
+ case "\$ACTION" in
+-make)   FLAGS="$AC_CFLAGS -shared"
++make)   FLAGS="$AC_CFLAGS $AC_LDFLAGS -shared"
+ 	unset VFLAGS
+ 	test "$USE_SONAME" && VFLAGS="-Wl,-soname,\$LIBNAME.\$MAJOR"
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1bba799
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_honour-build-flags.patch

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