jhbuild r2023 - in trunk: . modulesets patches

[apwingo svn gnome org]

Author: apwingo
Date: Tue Apr 15 17:10:56 2008
New Revision: 2023
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2023&view=rev

Log:
2008-04-15  Andy Wingo  <wingo pobox com>

	* modulesets/bootstrap.modules: Update libtool to 1.5.26 +
	multilib patch from Fedora's 1.5.24. See #518067.

	* patches/libtool-1.5.24-multilib.patch: New file.



Added:
   trunk/patches/libtool-1.5.24-multilib.patch
Modified:
   trunk/ChangeLog
   trunk/modulesets/bootstrap.modules

Modified: trunk/modulesets/bootstrap.modules
==============================================================================
--- trunk/modulesets/bootstrap.modules	(original)
+++ trunk/modulesets/bootstrap.modules	Tue Apr 15 17:10:56 2008
@@ -24,9 +24,9 @@
 
   <autotools id="libtool" autogen-sh="configure">
     <branch repo="ftp.gnu.org"
-	    module="libtool/libtool-1.5.22.tar.gz" version="1.5.22"
-	    size="2921483" md5sum="8e0ac9797b62ba4dcc8a2fb7936412b0">
-      <patch file="libtool-1.5.18-multilib.patch" strip="1" />
+	    module="libtool/libtool-1.5.26.tar.gz" version="1.5.26"
+	    size="2961939" md5sum="aa9c5107f3ec9ef4200eb6556f3b3c29">
+      <patch file="libtool-1.5.24-multilib.patch" strip="1" />
     </branch>
   </autotools>
 

Added: trunk/patches/libtool-1.5.24-multilib.patch
==============================================================================
--- (empty file)
+++ trunk/patches/libtool-1.5.24-multilib.patch	Tue Apr 15 17:10:56 2008
@@ -0,0 +1,25 @@
+--- libtool-1.5.24_patched/libtool.m4.multilib	2007-07-10 14:39:32.000000000 +0200
++++ libtool-1.5.24_patched/libtool.m4	2007-07-10 14:48:00.000000000 +0200
+@@ -559,6 +559,7 @@ s390*-*linux*|sparc*-*linux*)
+       esac
+       ;;
+     *64-bit*)
++      libsuff=64
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -1617,11 +1618,13 @@ linux* | k*bsd*-gnu)
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on