summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-09-27 06:32:29 +0000
committerMike Frysinger <vapier@gentoo.org>2009-09-27 06:32:29 +0000
commit93bf1384fcc4e829f7f61bae398eaa995d21f2c3 (patch)
tree65866ce19b75f52a945457a5f8220e389600a5e7 /sys-libs
parentVersion bump. (diff)
downloadgentoo-2-93bf1384fcc4e829f7f61bae398eaa995d21f2c3.tar.gz
gentoo-2-93bf1384fcc4e829f7f61bae398eaa995d21f2c3.tar.bz2
gentoo-2-93bf1384fcc4e829f7f61bae398eaa995d21f2c3.zip
Link rlfe dynamically against readline #284568 by Jonathan Callen.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/readline/ChangeLog5
-rw-r--r--sys-libs/readline/readline-6.0_p4.ebuild13
2 files changed, 13 insertions, 5 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index db82a1c8a448..bdb1339a5261 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/readline
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.136 2009/09/19 15:55:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.137 2009/09/27 06:32:29 vapier Exp $
+
+ 27 Sep 2009; Mike Frysinger <vapier@gentoo.org> readline-6.0_p4.ebuild:
+ Link rlfe dynamically against readline #284568 by Jonathan Callen.
19 Sep 2009; nixnut <nixnut@gentoo.org> readline-6.0_p3.ebuild:
ppc stable #283155
diff --git a/sys-libs/readline/readline-6.0_p4.ebuild b/sys-libs/readline/readline-6.0_p4.ebuild
index cf8c5b173bd3..ede059c0ad9f 100644
--- a/sys-libs/readline/readline-6.0_p4.ebuild
+++ b/sys-libs/readline/readline-6.0_p4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.0_p4.ebuild,v 1.1 2009/08/29 21:10:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.0_p4.ebuild,v 1.2 2009/09/27 06:32:29 vapier Exp $
inherit autotools eutils multilib toolchain-funcs flag-o-matic
@@ -60,7 +60,6 @@ src_unpack() {
# the bundled rlfe had its configure.in updated, but no one actually
# ran autoconf to have the configure file updated
- ln -s ../.. examples/rlfe/readline
cd examples/rlfe
eautoconf
}
@@ -72,10 +71,16 @@ src_compile() {
emake || die
if ! tc-is-cross-compiler ; then
+ # code is full of AC_TRY_RUN()
cd examples/rlfe
- append-ldflags -Lreadline
+ append-ldflags -L.
+ local l
+ for l in readline history ; do
+ ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
+ ln -sf ../../lib${l}.a lib${l}.a
+ done
econf || die
- emake || die "make rlfe failed"
+ emake || die
fi
}