[Pkg-cli-libs-commits] r4340 - in /packages/gnome-sharp2/trunk/debian: changelog ltmain-add-as-needed.patch ltmain-as-needed.sh rules

[raof-guest at users.alioth.debian.org]

Author: raof-guest
Date: Mon Jan  4 05:57:15 2010
New Revision: 4340

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4340
Log:
Replace logic to copy a pre-patched ltmain.sh supporting --as-needed with
logic to apply a patch to the post-autoreconf ltmain.sh doing the same thing.

This should be more robust; it certainly will be more robust over libtool
version changes, as the previous logic ensured a FTBFS with each new libtool
version.


Added:
    packages/gnome-sharp2/trunk/debian/ltmain-add-as-needed.patch
Removed:
    packages/gnome-sharp2/trunk/debian/ltmain-as-needed.sh
Modified:
    packages/gnome-sharp2/trunk/debian/changelog
    packages/gnome-sharp2/trunk/debian/rules

Modified: packages/gnome-sharp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/changelog?rev=4340&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/changelog (original)
+++ packages/gnome-sharp2/trunk/debian/changelog Mon Jan  4 05:57:15 2010
@@ -26,7 +26,15 @@
     + Let gnome-sharp2 meta package depend on the same source version for
       simple and reliable upgrades.
 
- -- Jo Shields <directhex at apebox.org>  Tue, 01 Dec 2009 10:14:44 +0000
+  [ Christopher James Halse Rogers ]
+  * debian/ltmain-add-as-needed.patch:
+    + Add --as-needed magic to ltmain.sh
+  * debian/rules:
+    + Apply ltmain-add-as-needed.patch after running autoreconf.  This should
+      be more robust than copying a patched ltmain.sh from debian/ as ltmain.sh
+      is required to be versioned in lock-step with the rest of libtool.      
+
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Mon, 04 Jan 2010 16:43:02 +1100
 
 gnome-sharp2 (2.24.1-4) unstable; urgency=low
 

Added: packages/gnome-sharp2/trunk/debian/ltmain-add-as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/ltmain-add-as-needed.patch?rev=4340&op=file
==============================================================================
--- packages/gnome-sharp2/trunk/debian/ltmain-add-as-needed.patch (added)
+++ packages/gnome-sharp2/trunk/debian/ltmain-add-as-needed.patch Mon Jan  4 05:57:15 2010
@@ -1,0 +1,40 @@
+Description: Patch to add --as-needed magic to ltmain.sh
+ This patch needs to be applied after autoreconf is run, and autoreconf should
+ be copying files, not symlinking (ie: the '-s' option should not be given) so
+ that system-wide files aren't accidentally patched.
+ .
+ This should be more robust than copying a pre-patched version of ltmain.sh
+ from debian/ on build, as ltmain.sh needs to be exactly the same version as 
+ the rest of libtool.
+Author: Christopher James Halse Rogers <raof at ubuntu.com>
+
+--- libtool-2.2.6b/libltdl/config/ltmain.sh	2010-01-04 05:33:00.810981679 +0000
++++ libtool-as-needed/libltdl/config/ltmain.sh	2010-01-04 00:18:29.715388881 +0000
+@@ -4716,6 +4716,11 @@
+ 	arg=$func_stripname_result
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++
+       -Wl,*)
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -5070,6 +5075,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"

Modified: packages/gnome-sharp2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gnome-sharp2/trunk/debian/rules?rev=4340&op=diff
==============================================================================
--- packages/gnome-sharp2/trunk/debian/rules (original)
+++ packages/gnome-sharp2/trunk/debian/rules Mon Jan  4 05:57:15 2010
@@ -16,8 +16,8 @@
 
 autoreconf: autoreconf-stamp
 autoreconf-stamp: patch-stamp
-	autoreconf -f -i -s
-	install --mode=755 $(CURDIR)/debian/ltmain-as-needed.sh $(CURDIR)/ltmain.sh
+	autoreconf -f -i
+	patch -p3 < debian/ltmain-add-as-needed.patch
 	touch $@
 
 config: config-stamp