summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-10-13 20:55:17 +0000
committerMike Frysinger <vapier@gentoo.org>2006-10-13 20:55:17 +0000
commit1d155e46489dedc42292ebea268514a9691dae27 (patch)
treed797da5b0855214332bb306540146da34b865684 /sys-libs/readline
parentStable on x86, bug #151141. (diff)
downloadgentoo-2-1d155e46489dedc42292ebea268514a9691dae27.tar.gz
gentoo-2-1d155e46489dedc42292ebea268514a9691dae27.tar.bz2
gentoo-2-1d155e46489dedc42292ebea268514a9691dae27.zip
Link against the local readline #151174 by Javier Armendariz.
(Portage version: 2.1.2_pre2-r5)
Diffstat (limited to 'sys-libs/readline')
-rw-r--r--sys-libs/readline/ChangeLog6
-rw-r--r--sys-libs/readline/files/readline-5.2-rlfe-build.patch14
-rw-r--r--sys-libs/readline/readline-5.2.ebuild4
3 files changed, 21 insertions, 3 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 673b9824bb85..f6a45e8ed9bb 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/readline
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.83 2006/10/13 10:59:24 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.84 2006/10/13 20:55:17 vapier Exp $
+
+ 13 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/readline-5.2-rlfe-build.patch, readline-5.2.ebuild:
+ Link against the local readline #151174 by Javier Armendariz.
13 Oct 2006; Roy Marples <uberlord@gentoo.org>
+files/readline-5.1-fbsd-pic.patch, readline-5.1_p4.ebuild,
diff --git a/sys-libs/readline/files/readline-5.2-rlfe-build.patch b/sys-libs/readline/files/readline-5.2-rlfe-build.patch
new file mode 100644
index 000000000000..9ad0b2d53f5c
--- /dev/null
+++ b/sys-libs/readline/files/readline-5.2-rlfe-build.patch
@@ -0,0 +1,14 @@
+make sure we link with the current build readline rather than
+the system installed one
+
+--- examples/rlfe/Makefile.in
++++ examples/rlfe/Makefile.in
+@@ -22,7 +22,7 @@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+ #LDFLAGS = -L$(READLINE_DIR)
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -Lreadline
+ LIBS = -lreadline -lhistory -lncurses @LIBS@
+
+ CPP=@CPP@
diff --git a/sys-libs/readline/readline-5.2.ebuild b/sys-libs/readline/readline-5.2.ebuild
index ac7deb3c9fc0..d9a4b67416b5 100644
--- a/sys-libs/readline/readline-5.2.ebuild
+++ b/sys-libs/readline/readline-5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2.ebuild,v 1.2 2006/10/13 10:59:24 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2.ebuild,v 1.3 2006/10/13 20:55:17 vapier Exp $
inherit eutils multilib toolchain-funcs
@@ -43,7 +43,7 @@ src_unpack() {
epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i})
done
epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
- #epatch "${FILESDIR}"/${PN}-5.1-rlfe-build.patch #116483
+ epatch "${FILESDIR}"/${PN}-5.2-rlfe-build.patch #151174
epatch "${FILESDIR}"/${PN}-5.1-rlfe-uclibc.patch
epatch "${FILESDIR}"/${PN}-5.1-fbsd-pic.patch