Add patch by Sunil to fix solaris linking #81058.

Package-Manager: portage-2.0.51-r15

5 files changed, 39 insertions, 8 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index e737276f6925..f638cf61bbee 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -10,7 +10,7 @@ MD5 63f67cbcb98920a75ba0b1a4b781519c glibc-2.3.4.20040808-r1.ebuild 27601
 MD5 96dc89a3ebadd5f1260ce517ffe6fef3 glibc-2.3.4.20041102.ebuild 32955
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 b85c16a0e65a32784335e40fb0edac0e glibc-2.2.5-r10.ebuild 4418
-MD5 8ff4bcf0c981e3635bcfbb4a7771579d glibc-2.3.4.20050125.ebuild 32900
+MD5 0c7d219e75650f87fbfaad571ccfa94f glibc-2.3.4.20050125.ebuild 32899
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
@@ -143,7 +143,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCC/A/ArHZZzCEUG0RAtORAJwNSV0HbaluBV5UZj+v4AY880VmbQCeMP5m
-jTVQ2ryyxarmLJuE9EsogU0=
-=KEBR
+iD8DBQFCDD9lArHZZzCEUG0RAnesAJ9aTl2zrRP3A0HLioyM8OUUj+MAhQCcDNcw
+7DEu9wWe90ORcemTfHAnc/k=
+=2qAO
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 2a7a7f2385d8..e6006f3d8c05 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/readline
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.43 2005/01/12 17:05:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.44 2005/02/11 05:10:38 vapier Exp $
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org> +files/5.0-solaris.patch,
+  readline-5.0-r1.ebuild:
+  Add patch by Sunil to fix solaris linking #81058.
 
   03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index f930a45aefd6..85b537e6756a 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,8 +1,9 @@
-MD5 53b106f22ca9161b272fb1baf38c1857 ChangeLog 6269
+MD5 55f6f763c5cdcc3ae48319e06f71c9db ChangeLog 6424
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 9aa1c503ecd861b594466b8a5357a03a readline-4.3-r5.ebuild 2757
 MD5 d9947115c3ce12d1c0dfcb46c2cba885 readline-4.3-r6.ebuild 3175
-MD5 93e18a2ef4dd245d48bf041994a75e08 readline-5.0-r1.ebuild 2391
+MD5 ad8c6dfc9d43528e6eb48b4921c6d4df readline-5.0-r1.ebuild 2432
+MD5 fe45d673627dab53fb3fcffcb4f55e4e files/5.0-solaris.patch 756
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
 MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
diff --git a/sys-libs/readline/files/5.0-solaris.patch b/sys-libs/readline/files/5.0-solaris.patch
new file mode 100644
index 000000000000..927bac5c202b
--- /dev/null
+++ b/sys-libs/readline/files/5.0-solaris.patch
@@ -0,0 +1,25 @@
+fixup solaris linker options
+
+http://bugs.gentoo.org/show_bug.cgi?id=81058
+
+--- support/shobj-conf.orig
++++ support/shobj-conf
+@@ -78,10 +78,14 @@
+ sunos5*-*gcc*|solaris2*-*gcc*)
+ 	SHOBJ_CFLAGS=-fpic
+ 	SHOBJ_LD='${CC}'
+-	# This line works for the Solaris linker in /usr/ccs/bin/ld
+-	SHOBJ_LDFLAGS='-shared -Wl,-i -Wl,-h,$@'
+-	# This line works for the GNU ld
+-#	SHOBJ_LDFLAGS='-shared -Wl,-h,$@'
++	ld_used=`gcc -print-prog-name=ld`
++	if ${ld_used} -V 2>&1 | grep -q GNU; then
++		# This line works for the GNU ld
++		SHOBJ_LDFLAGS='-shared -Wl,-h,$@'
++	else
++		# This line works for the Solaris linker in /usr/ccs/bin/ld
++		SHOBJ_LDFLAGS='-shared -Wl,-i -Wl,-h,$@'
++	fi
+ 
+ #	SHLIB_XLDFLAGS='-R $(libdir)'
+ 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
diff --git a/sys-libs/readline/readline-5.0-r1.ebuild b/sys-libs/readline/readline-5.0-r1.ebuild
index 392c050c8299..a73e6629f3d3 100644
--- a/sys-libs/readline/readline-5.0-r1.ebuild
+++ b/sys-libs/readline/readline-5.0-r1.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-libs/readline/readline-5.0-r1.ebuild,v 1.9 2005/01/12 17:05:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r1.ebuild,v 1.10 2005/02/11 05:10:38 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -31,6 +31,7 @@ src_unpack() {
 		epatch ${DISTDIR}/${PN}${PV/\.}-${x}
 	done
 	epatch ${FILESDIR}/bash-3.0-etc-inputrc.patch
+	epatch ${FILESDIR}/${PV}-solaris.patch
 
 	# force ncurses linking #71420
 	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"