[SCM] gmerlin/master: Make build-system use LDFLAGS (for hardening)

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 52cbe30fbfb0ae91eb6f4af033d9586337b09760
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Jul 2 16:35:25 2014 +0200

    Make build-system use LDFLAGS (for hardening)

diff --git a/debian/patches/hardening_ldflags.patch b/debian/patches/hardening_ldflags.patch
new file mode 100644
index 0000000..14eb600
--- /dev/null
+++ b/debian/patches/hardening_ldflags.patch
@@ -0,0 +1,35 @@
+Description: propagate LDFLAGS through configure
+ for hardening to take effect, we need to ensure that LDFLAGS passed to
+ configure, are actually used
+Author: IOhannes m zmölnig
+Last-Update: 2014-07-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- gmerlin.orig/configure.ac
++++ gmerlin/configure.ac
+@@ -24,6 +24,7 @@
+ AC_SUBST(LTVERSION_REVISION)
+ AC_SUBST(LTVERSION_AGE)
+ 
++SAVE_LDFLAGS=$LDFLAGS
+ SAVE_CFLAGS=$CFLAGS
+ 
+ AC_DISABLE_STATIC
+@@ -96,7 +97,7 @@
+   GMERLIN_DEP_RPATH=""
+ fi
+ 
+-LDFLAGS="$GMERLIN_DEP_RPATH"
++LDFLAGS="$SAVE_LDFLAGS $GMERLIN_DEP_RPATH"
+ AC_SUBST(GMERLIN_DEP_LIBS)
+ 
+ dnl
+@@ -1001,7 +1002,7 @@
+ AC_SUBST(TOP_SRCDIR)
+ 
+ dnl LDFLAGS for plugins
+-GMERLIN_PLUGIN_LDFLAGS='-export-symbols $(top_srcdir)/plugin.sym'
++GMERLIN_PLUGIN_LDFLAGS='-export-symbols $(top_srcdir)/plugin.sym' $SAVE_LDFLAGS
+ AC_SUBST(GMERLIN_PLUGIN_LDFLAGS)
+ 
+ dnl Configuration Subdirectiories
diff --git a/debian/patches/series b/debian/patches/series
index cd80bc6..7688a1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ gmerlin_visualizer_slave.patch
 fix_typos.patch
 binutils_gold.patch
 strip_doc_out.patch
+hardening_ldflags.patch

-- 
gmerlin packaging