Make sure Darwin links properly against included readline #100138.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 56 insertions, 7 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 191b9150399d..3ee8c0072f91 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.71 2005/07/07 18:36:15 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.72 2005/08/03 02:55:34 vapier Exp $
+
+  03 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/bash-3.0-force-static-linking.patch, bash-3.0-r12.ebuild:
+  Make sure Darwin links properly against included readline #100138.
 
   07 Jul 2005; Martin Schlemmer <azarah@gentoo.org> bash-3.0-r12.ebuild:
   Add parallel build fix patch back again.
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index b264d3ef87e9..9097bfc4e2ac 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -5,8 +5,8 @@ MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 3da49e27281cbe16582393239ba5b29b bash-2.05b-r11.ebuild 3715
 MD5 a4df32e089db48d7c99fd6be36368475 bash-2.05b-r9.ebuild 3516
 MD5 27a795f52631ec69ef83b28d72e449dc bash-3.0-r11.ebuild 5143
-MD5 a4c19e593835eae42dceddbea4d53fe0 ChangeLog 14621
-MD5 a2dbc8ed42c502dc530bd42efdd85d2b bash-3.0-r12.ebuild 5243
+MD5 2a2c1f0eed87a15565c4f3a3af664bed ChangeLog 14808
+MD5 4877c235a3800163a32f11e4bca0a883 bash-3.0-r12.ebuild 5346
 MD5 3b706b4e822e0480f1ba098db4b292f6 files/bash-3.0-parallel.patch 378
 MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
 MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
@@ -16,6 +16,7 @@ MD5 b518c92ffb4ee61be7e4b1d27264a652 files/bash-3.0-pgrp-pipe-fix.patch 462
 MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
 MD5 229ccc2980a94877f2e87f957e9da7bf files/bash_logout 205
 MD5 c8362f29e2f8e6cdfd3306c7bcce0439 files/bash-3.0-pwd.patch 583
+MD5 e685741a0d3aede0600541b946b99564 files/bash-3.0-force-static-linking.patch 952
 MD5 ccc195288edb06eb44f4d5e2a9c1da62 files/bash-3.0-crash.patch 1191
 MD5 6bc03ea9b1de46a4789e8223f2224658 files/bash-3.0-read-builtin-pipe.patch 689
 MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
@@ -45,7 +46,7 @@ MD5 13a88fae79fed8f76999ec8fdca2f085 files/digest-bash-3.0-r11 976
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC4Dj0gIKl8Uu19MoRAhDOAJ9CgcRwLPVZgqaPjrSs66fdbqLZigCePXuv
-1/eBNyTgf63cVizmM6cLlXM=
-=TYDJ
+iD8DBQFC8DI4gIKl8Uu19MoRAnsZAJ4p2hnjRMpw/pbs35P6BJtd0QRtfQCeNMdK
+4xIyBQxuE9kTbUD/xlNze/4=
+=Yjfl
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.0-r12.ebuild b/app-shells/bash/bash-3.0-r12.ebuild
index 8aa0d513eb65..9913bd3046f4 100644
--- a/app-shells/bash/bash-3.0-r12.ebuild
+++ b/app-shells/bash/bash-3.0-r12.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/app-shells/bash/bash-3.0-r12.ebuild,v 1.2 2005/07/07 18:36:15 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0-r12.ebuild,v 1.3 2005/08/03 02:55:34 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -59,6 +59,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-trap-fg-signals.patch
 	# Fix a problem when using pipes and PGRP_PIPE #92349
 	epatch "${FILESDIR}"/${P}-pgrp-pipe-fix.patch
+	# Make sure static linking always works #100138
+	epatch "${FILESDIR}"/${P}-force-static-linking.patch
 	# Log bash commands to syslog #91327
 	if use bashlogger ; then
 		echo
diff --git a/app-shells/bash/files/bash-3.0-force-static-linking.patch b/app-shells/bash/files/bash-3.0-force-static-linking.patch
new file mode 100644
index 000000000000..6a3f165bb71a
--- /dev/null
+++ b/app-shells/bash/files/bash-3.0-force-static-linking.patch
@@ -0,0 +1,42 @@
+Make sure linking against included readline always works.
+
+http://bugs.gentoo.org/100138
+
+--- configure
++++ configure
+@@ -477,8 +477,8 @@
+ #define READLINE 1
+ _ACEOF
+ 
+-	READLINE_LIB=-lreadline
+ 	if test "$opt_with_installed_readline" != "no" ; then
++		READLINE_LIB=-lreadline
+ 		case "$opt_with_installed_readline" in
+ 		yes)	RL_INCLUDE= ;;
+ 		*)	case "$RL_INCLUDEDIR" in
+@@ -490,6 +490,7 @@
+ 		READLINE_DEP=
+ 	else
+ 		RL_LIBDIR='$(dot)/$(LIBSUBDIR)/readline'
++		READLINE_LIB='$(RL_LIBDIR)/libreadline.a'
+ 		READLINE_DEP='$(READLINE_LIBRARY)'
+ 	fi
+ else
+@@ -503,8 +504,8 @@
+ _ACEOF
+ 
+ 	fi
+-	HISTORY_LIB=-lhistory
+  	if test "$opt_with_installed_readline" != "no"; then
++		HISTORY_LIB=-lhistory
+ 		HIST_LIBDIR=$RL_LIBDIR
+ 		HISTORY_DEP=
+ 		case "$opt_with_installed_readline" in
+@@ -517,6 +518,7 @@
+ 		esac
+ 	else
+ 		HIST_LIBDIR='$(dot)/$(LIBSUBDIR)/readline'
++		HISTORY_LIB='$(HIST_LIBDIR)/libhistory.a'
+ 		HISTORY_DEP='$(HISTORY_LIBRARY)'
+ 	fi
+ else