[SCM] ffmpeg/master: sanitize LDFLAGS variable

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 17e588e364b1f67c5e4c513bd24a91292bf24522
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 30 08:38:55 2011 +0100

    sanitize LDFLAGS variable
    
    it seems that dpkg-buildflags injects -Wl,-Bsymbolic-functions to
    LDFLAGS, which breaks the build on amd64. The exact cause is unclear,
    but our current theory is that -Bsymbolic-functions disables -Bsymbolic,
    on which the build system relies:
    
    21:27 <mru> siretart: so maybe the second flag disables it for data symbols
    21:28 <mru> ld manual isn't very informative in that regard
    21:28 <siretart> that's indeed a theory that would explain this mess
    
    Cherry-picked from http://bazaar.launchpad.net/~siretart/ffmpeg/packaging-trunk/revision/14

diff --git a/debian/confflags b/debian/confflags
index d56aa85..cd1424e 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -148,8 +148,9 @@ ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   lib1394-dev += libraw1394-dev, libdc1394-22-dev
 endif
 
-# XXX this probably needs fixing
+# Sanitize injected compiler in linker flags
 CFLAGS :=
+LDFLAGS :=
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 # Various parts of ffmpeg (and swscale) FTBFS when compiling with -fPIC
diff --git a/debian/rules b/debian/rules
index dfd6175..291796e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ include debian/confflags
 $(info FLAVORS = $(FLAVORS))
 $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
 $(info CFLAGS = $(CFLAGS))
+$(info LDFLAGS = $(LDFLAGS))
 
 snapshot_version:
 	[ ! -r .svnrevision ] || \
@@ -37,7 +38,7 @@ configure-%: configure-stamp-%
 configure-stamp-%: $(QUILT_STAMPFN) snapshot_version
 	dh_testdir
 	mkdir -p debian-$*
-	cd debian-$* && CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
+	cd debian-$* && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
 		$($*_build_confflags) $(extra_$*_build_confflags)
 	touch $@
 

-- 
FFmpeg packaging