Make sure rlfe builds against the local version of readline #116483.

Package-Manager: portage-2.0.53

4 files changed, 40 insertions, 14 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 725444d1c5e0..58cae563a182 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.55 2005/12/23 17:02:10 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.56 2005/12/24 04:54:11 vapier Exp $
+
+  24 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/readline-5.1-rlfe-build.patch, readline-5.1-r2.ebuild:
+  Make sure rlfe builds against the local version of readline #116483.
 
   23 Dec 2005; Joel Martin <kanaka@gentoo.org> readline-5.1-r2.ebuild:
   rlfe does not cross-compile, don't build it when cross-compiling
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index cc96f05458b2..a6a270c619c0 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,13 +1,12 @@
-MD5 5ee00221878f6619696d6a59dbcf4660 ChangeLog 8261
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 82ac0eae5f66926062b260f7d09de7c0 readline-4.3-r5.ebuild 2764
-MD5 e16aefe27f29117c7a4e7be342e920b4 readline-4.3-r6.ebuild 3090
-MD5 d33ebebef248a79c288c6b1dce06b0ee readline-5.0-r2.ebuild 2778
-MD5 505fa4954536f8a9ff27c56bfb31b4d8 readline-5.1-r2.ebuild 2854
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2b170a389cc04945e4ff8bc65bf7f971 ChangeLog 8447
 MD5 d687545889dacb43e121f4932d99a534 files/bash-3.0-etc-inputrc.patch 1443
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
 MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r2 350
+MD5 1d930552cdea6057066fcf79714f9253 files/digest-readline-5.1-r2 122
 MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
 MD5 b908c05444b4c9edbeefa1977345182e files/readline-5.0-darwin.patch 461
 MD5 6fea6318a26be7b6186ba83c42fb0d75 files/readline-5.0-del-backspace-policy.patch 1074
@@ -15,5 +14,17 @@ MD5 d5f28667389d9681136307274ebc1f28 files/readline-5.0-no_rpath.patch 363
 MD5 cd1beb3627cb585cac6adcb530a01823 files/readline-5.0-parallel.patch 849
 MD5 a0bad5c8ba91f5c50ea6c2c97a76f2d1 files/readline-5.0-self-insert.patch 2463
 MD5 fe45d673627dab53fb3fcffcb4f55e4e files/readline-5.0-solaris.patch 756
-MD5 1d930552cdea6057066fcf79714f9253 files/digest-readline-5.1-r2 122
 MD5 e4ac33c0a2293b72378e00e8729c71af files/readline-5.1-cleanups.patch 3817
+MD5 73869a19bab0f37a7ee46e377d2bac15 files/readline-5.1-rlfe-build.patch 252
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 82ac0eae5f66926062b260f7d09de7c0 readline-4.3-r5.ebuild 2764
+MD5 e16aefe27f29117c7a4e7be342e920b4 readline-4.3-r6.ebuild 3090
+MD5 d33ebebef248a79c288c6b1dce06b0ee readline-5.0-r2.ebuild 2778
+MD5 70f8be4c722093f8290f8116d6d4eb9c readline-5.1-r2.ebuild 2928
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDrNR92+ySkm8kpY0RAvqNAKDDZLmwhd5IauQNvfAHcrV502F/zQCfVInw
+Nfbi+k5F+qT82mBzmrtRKpg=
+=SCBv
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-5.1-rlfe-build.patch b/sys-libs/readline/files/readline-5.1-rlfe-build.patch
new file mode 100644
index 000000000000..3429c0fb871d
--- /dev/null
+++ b/sys-libs/readline/files/readline-5.1-rlfe-build.patch
@@ -0,0 +1,11 @@
+--- examples/rlfe/Makefile.in
++++ examples/rlfe/Makefile.in
+@@ -22,7 +22,7 @@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+ #LDFLAGS = -L$(READLINE_DIR)
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -L../..
+ LIBS = -lreadline -lhistory -lncurses
+ 
+ CPP=@CPP@
diff --git a/sys-libs/readline/readline-5.1-r2.ebuild b/sys-libs/readline/readline-5.1-r2.ebuild
index 0c6909c5ba2c..9ab560ba914d 100644
--- a/sys-libs/readline/readline-5.1-r2.ebuild
+++ b/sys-libs/readline/readline-5.1-r2.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.1-r2.ebuild,v 1.3 2005/12/23 17:02:11 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.1-r2.ebuild,v 1.4 2005/12/24 04:54:11 vapier Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -41,6 +41,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/bash-3.0-etc-inputrc.patch
 	epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
 	epatch "${FILESDIR}"/${P}-cleanups.patch
+	epatch "${FILESDIR}"/${P}-rlfe-build.patch #116483
+	ln -s ../.. examples/rlfe/readline
 
 	# force ncurses linking #71420
 	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
@@ -53,11 +55,9 @@ src_compile() {
 	econf --with-curses --libdir=/usr/$(get_libdir) || die
 	emake || die
 
-	if ! tc-is-cross-compiler; then
-		cd examples/rlfe
-		econf
-		emake || die
-	fi
+	cd examples/rlfe
+	econf || die
+	emake || die "make rlfe failed"
 }
 
 src_install() {