summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Martin <kanaka@gentoo.org>2005-12-27 04:55:15 +0000
committerJoel Martin <kanaka@gentoo.org>2005-12-27 04:55:15 +0000
commitdaa6e9992c2c63454c9447eb070e69cd72e77c3c (patch)
treeefae1b8d9380fadce903532183fa3c3a347e602c /sys-libs/readline
parentAddresses bug #111963. Fix contributed by Sir No <wiktorw@people.pl>. Also so... (diff)
downloadgentoo-2-daa6e9992c2c63454c9447eb070e69cd72e77c3c.tar.gz
gentoo-2-daa6e9992c2c63454c9447eb070e69cd72e77c3c.tar.bz2
gentoo-2-daa6e9992c2c63454c9447eb070e69cd72e77c3c.zip
Cross-compile fix was partially backed out (hi vapier), put it back in.
(Portage version: 2.0.53)
Diffstat (limited to 'sys-libs/readline')
-rw-r--r--sys-libs/readline/ChangeLog5
-rw-r--r--sys-libs/readline/Manifest14
-rw-r--r--sys-libs/readline/readline-5.1-r2.ebuild10
3 files changed, 11 insertions, 18 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index fbee80a3a3d8..bf0528c6d8b4 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,9 @@
# 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.57 2005/12/24 17:31:32 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.58 2005/12/27 04:55:15 kanaka Exp $
+
+ 27 Dec 2005; Joel Martin <kanaka@gentoo.org> readline-5.1-r2.ebuild:
+ Cross-compile fix was partially backed out, put it back in.
24 Dec 2005; <solar@gentoo.org> +files/readline-5.1-rlfe-uclibc.patch,
readline-5.1-r2.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 7a072a63bb86..082affa67581 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 102c5e9ee59bc12cf16abdd9c664b507 ChangeLog 8613
MD5 d687545889dacb43e121f4932d99a534 files/bash-3.0-etc-inputrc.patch 1443
MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
@@ -21,13 +18,4 @@ 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 45c613ee86f337789f1bdb577f60de00 readline-5.1-r2.ebuild 2973
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iQCVAwUBQ62GAJ4WFLgrx1GWAQKHsAP+Kl8gVF2ttU7yuM618ke5wreCt/vhKRhX
-wpuipl3GhIslkcOjJsBnb0tPFwQVJZ4x3DlQNfVF6I81LzqHWmst+Yaclj/djp7+
-MQrmRd50HzuoThEHzB2tnVrKEyuyGhweahWWgdXCzPy/GaPHRpgwT+JDqg4xF6Md
-f75gHmKCmJo=
-=eFol
------END PGP SIGNATURE-----
+MD5 3500c87707628c1b824e56c27c9875f2 readline-5.1-r2.ebuild 3013
diff --git a/sys-libs/readline/readline-5.1-r2.ebuild b/sys-libs/readline/readline-5.1-r2.ebuild
index 89713e40f533..37c610dbb79a 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.5 2005/12/24 17:31:32 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.1-r2.ebuild,v 1.6 2005/12/27 04:55:15 kanaka Exp $
inherit eutils multilib toolchain-funcs
@@ -57,9 +57,11 @@ src_compile() {
econf --with-curses --libdir=/usr/$(get_libdir) || die
emake || die
- cd examples/rlfe
- econf || die
- emake || die "make rlfe failed"
+ if ! tc-is-cross-compiler; then
+ cd examples/rlfe
+ econf || die
+ emake || die "make rlfe failed"
+ fi
}
src_install() {