Fix building with people who set LD_LIBRARY_PATH to retarded values #99593.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 33 insertions, 8 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index 98eaa624ea25..9ebcef158f45 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.87 2005/08/18 22:27:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.88 2005/09/14 04:44:00 vapier Exp $
+
+  14 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/file-4.15-libtool.patch, file-4.15.ebuild:
+  Fix building with people who set LD_LIBRARY_PATH to retarded values #99593.
 
 *file-4.15 (18 Aug 2005)
 
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index b2ce209b9008..72c9b2c5ba23 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -3,9 +3,9 @@ Hash: SHA1
 
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 c6073a11ea3fcb5cc0d1625a54aad8d4 file-4.12.ebuild 2081
-MD5 30111fda39ec8ab7ddb1223189a32380 file-4.15.ebuild 1344
+MD5 8dde58cae0df7546dd0e7cfe6c8805eb file-4.15.ebuild 1390
 MD5 213bc8ded7a22b2fcb129f4ee60e892c file-4.13.ebuild 2226
-MD5 d565d5003ccb755877835667dbf91f7b ChangeLog 10919
+MD5 1561ba763ed44a049bb433b235bda676 ChangeLog 11100
 MD5 f856a50dada76a4ca5cee58fbd04e76b files/file-4.13-cross-compile.patch 964
 MD5 a952f0eca26a046e4b815529d2b734ef files/misc.magic 71
 MD5 407c20e1fb3186144d6c7d2788714163 files/digest-file-4.13 61
@@ -14,11 +14,12 @@ MD5 13c1a487996e5e26560f9feaae56e811 files/file-4.14-gcc2.patch 494
 MD5 56c4aa931e56a129d1c631c52a3b6d67 files/digest-file-4.15 61
 MD5 d336b3490362624aec2e30679c44a198 files/digest-file-4.12 61
 MD5 f0f2d2181cac822f0c4d4675fb1ff38c files/cracklib.magic 360
+MD5 26f26c3f7caf28f0bdb9dbb6fe83c254 files/file-4.15-libtool.patch 561
 MD5 66df8eecd30769daeb3f643dc6432db3 files/file-4.xx-mips-gentoo.patch 5578
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDBgRCgIKl8Uu19MoRAt6tAJ40ODRaxOiv11blu67lT8xdtIIyzgCff9xH
-YadwqaXXMkzcnnQVTrskGuA=
-=tc6h
+iD8DBQFDJ6qggIKl8Uu19MoRAq7wAJ9FcPxNEN8RUkq6J74fEcjrWxKq8ACfSlHN
+KP3N47ZZse6IU3GyTEf5aJ0=
+=3sD8
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-4.15.ebuild b/sys-apps/file/file-4.15.ebuild
index dfb663b811bb..7cf2e2471e78 100644
--- a/sys-apps/file/file-4.15.ebuild
+++ b/sys-apps/file/file-4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.15.ebuild,v 1.2 2005/08/19 16:08:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.15.ebuild,v 1.3 2005/09/14 04:44:00 vapier Exp $
 
 inherit distutils libtool
 
@@ -20,7 +20,8 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
 
-	uclibctoolize
+	epatch "${FILESDIR}"/${P}-libtool.patch #99593
+	elibtoolize
 
 	# make sure python links against the current libmagic #54401
 	sed -i "/library_dirs/s:'\.\./src':'../src/.libs':" python/setup.py
diff --git a/sys-apps/file/files/file-4.15-libtool.patch b/sys-apps/file/files/file-4.15-libtool.patch
new file mode 100644
index 000000000000..c41c8fec297d
--- /dev/null
+++ b/sys-apps/file/files/file-4.15-libtool.patch
@@ -0,0 +1,19 @@
+Fix build time issues with tools who like to export LD_LIBRARY_PATH
+to retarded values.
+
+http://bugs.gentoo.org/99593
+
+--- ltmain.sh
++++ ltmain.sh
+@@ -5085,6 +5085,11 @@
+ 	$echo >> $output "\
+     if test \"\$libtool_execute_magic\" != \"$magic\"; then
+       # Run the actual program with our arguments.
++
++      # Make sure env LD_LIBRARY_PATH does not mess us up
++      if test -n \"\${LD_LIBRARY_PATH+set}\"; then
++        export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
++      fi
+ "
+ 	case $host in
+ 	# Backslashes separate directories on plain windows