[SCM] liblivemedia/master: Pass LDFLAGS to the linker.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Nov 22 13:16:53 UTC 2012


The following commit has been merged in the master branch:
commit 9f46ad7764f5ba4dc6e6f7b71b08a0c1d0471c69
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Nov 22 13:16:07 2012 +0000

    Pass LDFLAGS to the linker.

diff --git a/debian/patches/301_hardening.patch b/debian/patches/301_hardening.patch
index 82754eb..3f47e23 100644
--- a/debian/patches/301_hardening.patch
+++ b/debian/patches/301_hardening.patch
@@ -1,10 +1,12 @@
 Description: Prevent build failure when compiled with
  -Wformat -Werror=format-security.
+ Pass LDFLAGS to the linker.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: live-devel at lists.live555.com
 ---
+ config.linux           |    2 +-
  testProgs/sapWatch.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 --- liblivemedia.orig/testProgs/sapWatch.cpp
 +++ liblivemedia/testProgs/sapWatch.cpp
@@ -17,3 +19,14 @@ Forwarded: live-devel at lists.live555.com
    }
  
    return 0; // only to prevent compiler warning
+--- liblivemedia.orig/config.linux
++++ liblivemedia/config.linux
+@@ -8,7 +8,7 @@ CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall
+ OBJ =			o
+ LINK =			c++ -o
+ LINK_OPTS =		-L.
+-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
++CONSOLE_LINK_OPTS =	$(LDFLAGS) $(LINK_OPTS)
+ LIBRARY_LINK =		ar cr 
+ LIBRARY_LINK_OPTS =	
+ LIB_SUFFIX =			a
diff --git a/debian/rules b/debian/rules
index b9314d1..f028f07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,11 +35,12 @@ build-stamp: configure-stamp
 	cp debian/upstream.changelog changelog.txt
 	for f in BasicUsageEnvironment \
 	            UsageEnvironment liveMedia groupsock; do \
+	  LDFLAGS="$(LDFLAGS)" \
 	  CFLAGS="$(CFLAGS) -fPIC -DPIC" $(MAKE) -C $${f} || exit 1; \
 	  mv "$${f}/lib$${f}.a" "$${f}/lib$${f}_pic.a"; \
 	done
 	$(MAKE) clean
-	CFLAGS="$(CFLAGS)" $(MAKE)
+	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE)
 	touch build-stamp
 
 clean:

-- 
liblivemedia packaging



More information about the pkg-multimedia-commits mailing list