[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/3.1.1-1-13-g6a3ec04

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit cdb39ff0fdcec63d4648729a3154ed40da95593a
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sat Jun 18 12:19:17 2011 +0200

    Pass -Wl,--as-needed to linker flags

diff --git a/debian/changelog b/debian/changelog
index 6d47dbe..6f836c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,12 @@ empathy (3.1.2.1-1) UNRELEASED; urgency=low
   * debian/rules:
     - Add --enable-geocode to configure flags
     - Add --with-cheese to configure flags
+    - Add -Wl,--as-needed to LDFLAGS
   * debian/patches/0001-add-missing-gio.patch: Add missing gio linkage to fix
     FTBFS
+  * debian/patches/99_ltmain_as-needed.patch: Fix --as-needed logic
 
- -- Laurent Bigonville <bigon at debian.org>  Tue, 14 Jun 2011 23:12:51 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 18 Jun 2011 12:43:20 +0200
 
 empathy (3.1.1-1) experimental; urgency=low
 
diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/patches/99_ltmain_as-needed.patch
new file mode 100644
index 0000000..d83fea8
--- /dev/null
+++ b/debian/patches/99_ltmain_as-needed.patch
@@ -0,0 +1,32 @@
+Index: libnotify-0.5.0/ltmain.sh
+===================================================================
+--- libnotify-0.5.0.orig/ltmain.sh	2010-06-24 10:01:38.000000000 +0200
++++ libnotify-0.5.0/ltmain.sh	2010-06-29 07:27:27.202952725 +0200
+@@ -4716,6 +4716,11 @@
+ 	arg=$func_stripname_result
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++
+       -Wl,*)
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -5067,6 +5072,15 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-Wl,--as-needed)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	  fi
++	  continue
++	  ;;
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"
diff --git a/debian/patches/series b/debian/patches/series
index 12b7672..ca3f6d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-add-missing-gio.patch
+99_ltmain_as-needed.patch
diff --git a/debian/rules b/debian/rules
index 06de007..d730164 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ common-binary-post-install-arch:: list-missing
 
 # Ensure at build time that the library has no dependencies on undefined
 # symbols, and speed up loading.
-LDFLAGS += -Wl,-z,defs -Wl,-O1
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
                              --enable-webkit \

-- 
Empathy packaging