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
commit7c3e2c9a69e93e54459705e0eab1253ed855132a (patch)
tree7a3ca9c78d377beb27d7d70be182f5d47363e618 /sys-libs
parentRemove WANT_AUTOMAKE which is not needed any longer since bug #270010 was fix... (diff)
downloadhistorical-7c3e2c9a69e93e54459705e0eab1253ed855132a.tar.gz
historical-7c3e2c9a69e93e54459705e0eab1253ed855132a.tar.bz2
historical-7c3e2c9a69e93e54459705e0eab1253ed855132a.zip
Fix build on Gentoo/FreeBSD by removing references do objformat.
Package-Manager: portage-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/Manifest10
-rw-r--r--sys-libs/readline/readline-6.0_p3.ebuild6
3 files changed, 15 insertions, 7 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/Manifest b/sys-libs/readline/Manifest
index c9f8a7e42b85..6b016dba62b9 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -56,13 +56,13 @@ EBUILD readline-5.0-r2.ebuild 2425 RMD160 76e46f0270a9e6f3c35365062ffd55f9ec9266
EBUILD readline-5.1_p4.ebuild 2801 RMD160 93031c30d6014333ce909240ca2acee4440f6833 SHA1 4764bb18084786f1674d85d4924f890582662722 SHA256 14b489d5603af47ba0d42a5dfdd807747ecdca198b1f53df44fd6d506e5dc851
EBUILD readline-5.2_p13.ebuild 2730 RMD160 4b1c83ad3d87b97736f57cd6b2fe7fd556b474a6 SHA1 e47ce0cc60f83336995d305bae118fc960559cb8 SHA256 0efebbffeb7ade4fd1244a5a455a19eb51328640a90298420ec3ee85872ff5fb
EBUILD readline-6.0.ebuild 2559 RMD160 136e085e20fe7d31e85e622f36966f7026eca181 SHA1 cadf748051225d12cec18aa7ea1aa1fb5b0e2b9f SHA256 cebdcbffb7a73c8465e958eb945b278780e23ddc5cbef3b7a02cbdb28b549a63
-EBUILD readline-6.0_p3.ebuild 2562 RMD160 c693533ab7ba2653e9844c6c1d319b75d269316b SHA1 f729355dec6835b6e20fee79e368c5df65a69386 SHA256 1699e201698fde7768aa53250eb726d5b02fcfd0422a06eb54c84aa632198777
-MISC ChangeLog 16437 RMD160 5bcc860c43492531cfaaefa2d95ac73c37f75588 SHA1 57915c9592a28bba9e085b059a0bf4b3eae5f260 SHA256 084af4cb414c265d9da9650b2aa317e4e6be7d4fb0f61a1bd4e40e8db36fe372
+EBUILD readline-6.0_p3.ebuild 2769 RMD160 77a63430a1b78b9b7777a5fbf4b33bf29bb8dac8 SHA1 572de0d0390497c935bfdb9cea24c977f091518e SHA256 04bd67930c64c4765c276d407d69d67f6126778c765655fb54e9485f6ed19efb
+MISC ChangeLog 16590 RMD160 a4654cda6df580c7cf3f209378f58e39e1d7cc10 SHA1 a6825f14e2257c38d3114e7ce1177d6a32cb2880 SHA256 f5fe74ecc6d78ca44f057fea1161472bcc6459ce15ca0267d71f9cd78ea450b1
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkoQfG4ACgkQn/5bYzqsSmHN2wCeJoGOXgAVzuC3hekmYOXIOCEO
-1kcAnjffNcDGzO8U6Mm0IB1H9f+nFJ3/
-=oAXS
+iEYEARECAAYFAkoRSxAACgkQAiZjviIA2XifpACfSR/BUGtwJXdzBJO87VHL63ua
+0M0AoMqmM1iJB2pa4T1L7IUIqNdYe0nA
+=H3dO
-----END PGP SIGNATURE-----
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