diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-02-11 05:10:39 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-02-11 05:10:39 +0000 |
| commit | ff0e9980cf646d1e46f08de3d9131156beb46871 (patch) | |
| tree | fdb06917abe2f7fe7aa0bc46f82b8a004ce2b855 | |
| parent | more KEYWORDS (diff) | |
| download | gentoo-2-ff0e9980cf646d1e46f08de3d9131156beb46871.tar.gz gentoo-2-ff0e9980cf646d1e46f08de3d9131156beb46871.tar.bz2 gentoo-2-ff0e9980cf646d1e46f08de3d9131156beb46871.zip | |
Add patch by Sunil to fix solaris linking #81058.
(Portage version: 2.0.51-r15)
| -rw-r--r-- | sys-libs/readline/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/readline/files/5.0-solaris.patch | 25 | ||||
| -rw-r--r-- | sys-libs/readline/readline-5.0-r1.ebuild | 3 |
3 files changed, 32 insertions, 2 deletions
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/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" |