diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-12-24 04:54:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-24 04:54:11 +0000 |
| commit | 27ee07bb9011d05cbe5af433cf705e8eab7cf766 (patch) | |
| tree | 433abc0fded45c3f2cb3977a087cc36e9f474958 /sys-libs | |
| parent | update selinux patch. (diff) | |
| download | gentoo-2-27ee07bb9011d05cbe5af433cf705e8eab7cf766.tar.gz gentoo-2-27ee07bb9011d05cbe5af433cf705e8eab7cf766.tar.bz2 gentoo-2-27ee07bb9011d05cbe5af433cf705e8eab7cf766.zip | |
Make sure rlfe builds against the local version of readline #116483.
(Portage version: 2.0.53)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/readline/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/readline/files/readline-5.1-rlfe-build.patch | 11 | ||||
| -rw-r--r-- | sys-libs/readline/readline-5.1-r2.ebuild | 12 |
3 files changed, 22 insertions, 7 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/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() { |