summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-05-18 11:48:26 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-05-18 11:48:26 +0000
commit83d70001ae52baee0372614cf8214861f567b84c (patch)
tree75a36b2cf902a925a9b09968c4135b2dab9d0c3f /sys-libs
parentRemove WANT_AUTOMAKE which is not needed any longer since bug #270010 was fix... (diff)
downloadgentoo-2-83d70001ae52baee0372614cf8214861f567b84c.tar.gz
gentoo-2-83d70001ae52baee0372614cf8214861f567b84c.tar.bz2
gentoo-2-83d70001ae52baee0372614cf8214861f567b84c.zip
Fix build on Gentoo/FreeBSD by removing references do objformat.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/readline/ChangeLog6
-rw-r--r--sys-libs/readline/readline-6.0_p3.ebuild6
2 files changed, 10 insertions, 2 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 660c23ccdffb..3d20e19a976d 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
# 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.128 2009/05/17 21:06:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.129 2009/05/18 11:48:26 flameeyes Exp $
+
+ 18 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+ readline-6.0_p3.ebuild:
+ Fix build on Gentoo/FreeBSD by removing references do objformat.
*readline-6.0_p3 (17 May 2009)
diff --git a/sys-libs/readline/readline-6.0_p3.ebuild b/sys-libs/readline/readline-6.0_p3.ebuild
index 8c866e8cafe0..203b3295d634 100644
--- a/sys-libs/readline/readline-6.0_p3.ebuild
+++ b/sys-libs/readline/readline-6.0_p3.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_p3.ebuild,v 1.1 2009/05/17 21:06:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.0_p3.ebuild,v 1.2 2009/05/18 11:48:26 flameeyes Exp $
inherit autotools eutils multilib toolchain-funcs flag-o-matic
@@ -54,6 +54,10 @@ src_unpack() {
# force ncurses linking #71420
sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
+ # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+ # objformat for years, so we don't want to rely on that.
+ sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
# 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