From fdd80e774d60075bdf8bf5114bd2d1c1bcf6251b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 28 Mar 2012 18:13:09 +0000 Subject: Fix cross-compiling after move to external readline. --- app-shells/bash/ChangeLog | 6 +++++- app-shells/bash/Manifest | 24 ++---------------------- app-shells/bash/bash-4.2_p20.ebuild | 7 +++++-- app-shells/bash/bash-4.2_p24.ebuild | 7 +++++-- 4 files changed, 17 insertions(+), 27 deletions(-) (limited to 'app-shells') diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 3914a8a0d6c1..123855f78417 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-shells/bash # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.305 2012/03/28 16:34:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.306 2012/03/28 18:13:09 vapier Exp $ + + 28 Mar 2012; Mike Frysinger bash-4.2_p20.ebuild, + bash-4.2_p24.ebuild: + Fix cross-compiling after move to external readline. 28 Mar 2012; Mike Frysinger bash-4.2_p20.ebuild: Mark alpha/ia64/m68k/s390/sh/sparc stable #407937. diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 54ce3edc2b3e..8bcc846fbdbf 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX autoconf-mktime-2.59.patch 4686 RMD160 64f719df39ae0a17999cb6b87ce9c5e275fcd7eb SHA1 4355b22b415c703c8ca9cc1b7b89ec44edc7ad4c SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba AUX bash-3.0-configs.patch 2538 RMD160 00e8015531efb6a59298782581928f1aff2247e6 SHA1 7f4615de4ac2219372d34dfbead3311fcfdfab2a SHA256 09d11c8e6158b2346fc39830d75af2210cd1cec7c8e9965aed96b66213310d3f AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025 @@ -189,25 +186,8 @@ EBUILD bash-4.1_p11.ebuild 5660 RMD160 307a3558a0b42808eacdd776841833cc40606d3d EBUILD bash-4.1_p7.ebuild 5647 RMD160 d304c9b6eeb384f9baa4a84e262f4725a2fad7b0 SHA1 7bbd8c7145bd494ff86fde53b9ba63a9aa1dd3de SHA256 f5d0f3136170e346cd97f30cc735f1e007183c5ae73bedb12b596c5b26323feb EBUILD bash-4.1_p9.ebuild 5647 RMD160 a4735eb85dacda84c5e616c40b18d3bd6090c2b8 SHA1 fb124d72adcab6e86240cfc991c18eb0681333a1 SHA256 9dfe8f46a4e24aa1a994e886fae5a80228449b0471e0856368e521ad2fd36588 EBUILD bash-4.2_p10.ebuild 5604 RMD160 82d81068ca21f03dfa36e3f8e4b1506e91ef4a4d SHA1 65ae606556415c0cd82d1a8373aeb8574447650a SHA256 f0359ff78cd7c8b62e6e613779d83da25c158d430f2c54dee9c3d5fc2e1baf40 -EBUILD bash-4.2_p20.ebuild 5823 RMD160 2eba2b1a17ca2398edfbe42e37377650eca2246a SHA1 c3eb2e2b5600aa6d46559bc37dcb7a7d4a62530e SHA256 1d9513c7cf8f51ff130ee671fbc184bc839fd12789e4c1e78704759141f8d2d4 -EBUILD bash-4.2_p24.ebuild 5834 RMD160 4951ce74936da390a16eba03a7f5e34cbad82b0b SHA1 1145f8eab90f979f8e1ba52aa00f6663564de9b6 SHA256 88c5ed4da21e8748919c1b3e21f8a7114922d3d6daa86d2d4d9b98875c3c7b44 +EBUILD bash-4.2_p20.ebuild 5963 RMD160 05a29c0324d629243de8b2ad8da8a3d550e9a45a SHA1 7706d77dd20da9dcaf82584b27ac84cf4705651f SHA256 85c4f6ae4a25f6c188ad074dfbc2e8750a146b93018b098b19dcebee1baba801 +EBUILD bash-4.2_p24.ebuild 6024 RMD160 1805c8b145e2678a1c741246e1d2a703949cd904 SHA1 876c2ed15b4ae81e90bb9060234707292fc8dd8d SHA256 0f8def1bba78a1b9ade8cce3baf3771e46dd0ddf3e7d8c31916ad7b44aa1c1cb EBUILD bash-4.2_p8-r1.ebuild 5546 RMD160 d60f2c28b28dcb55b063f16b8ee5400b88e0f6d6 SHA1 096e27b3ead5a1ec0756f88471db3084bee98f01 SHA256 466fd15f97af04edd495bf0452c8bebb0725288c2503362ff3d0088e849ca105 MISC ChangeLog 46911 RMD160 6b074a8e37ceef1de630f774c63ae8926409e3c0 SHA1 fcb3fc03115049e0ba6c614d01bd921e5d5fcb80 SHA256 080e52a4571b3a1aab03f49c4b047d0cb41b0ab3fbf306b42c05ffce1a615a15 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iQIcBAEBAgAGBQJPcz2PAAoJELEHsLL7fEFW94AP/3LtuVwp7RYFmTKaqxfokCMp -UeBqG+kidWNvYLW3xgV6oXrJc5wmGOyr84kiWBILa+AOgE83wtpkM0E6p37ixKhc -2gZZA76Ft5n8r2wFIYtkfOmAhtY5CeGxsudRjRNTTuUWttPeLjY0SF9TN+lXlJmO -AWytE+BtIkpo6f+h+80mxJqqbRHSikO4wUy0EAnZfyIFjP4xKobKKmeqe9eB2nLm -kUeIrPFlTEjfss02c2lKj1NkSCOaH/x0cK43W9yeW8EogvVHti+4vystD7m71hnc -+u4C1biiBah+dBs1b/EvPlt1rszf3WEkKxwgdIVDgqmrO0Inp4u7/+s0VW1uYVP4 -SLxygj+6sTmNKD9hUIG04mC7eJSjTo1zXHCoRyoYH3mbSY3SWU8aXWhRh4u/Ujgb -ZNHRNYYZbx5QloXI91HR1GUwr6xuhI45JJArPuWwlZ5yIE4Ti3JUTw36wtiqmz6V -BGLOr3b5Vfldmgie5431zUzcotk4ouGJTFQFlKxSYqm2wnOPY5lyWstXeHac6VVE -mS/KYn9D5Mzyq2l+rGgdknacuNaRZQ8KW7p+Tbu3LhhLvK7CW2MR8SAzkWfa3Ztc -g2Udc6yfdoSZq9VZE3a0AcVrBmZUQCkgwLKF14puJZe61KFWsNOqx5H49XAJCvpM -E86aBncjK0BaogFuqf3m -=BKQQ ------END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-4.2_p20.ebuild b/app-shells/bash/bash-4.2_p20.ebuild index c43c53fce128..069acc14e112 100644 --- a/app-shells/bash/bash-4.2_p20.ebuild +++ b/app-shells/bash/bash-4.2_p20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.11 2012/03/28 16:34:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.12 2012/03/28 18:13:09 vapier Exp $ EAPI="1" @@ -105,6 +105,9 @@ src_compile() { # in the PM (and the readline ebuild itself preserves the old # libs during upgrades), linking against the system copy should # be safe. + # Exact cached version here doesn't really matter as long as it + # is at least what's in the DEPEND up above. + export ac_cv_rl_version=6.2 # Force linking with system curses ... the bundled termcap lib # sucks bad compared to ncurses. For the most part, ncurses @@ -113,7 +116,7 @@ src_compile() { use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash econf \ - --with-installed-readline \ + --with-installed-readline=. \ --with-curses \ $(use_with afs) \ $(use_enable net net-redirections) \ diff --git a/app-shells/bash/bash-4.2_p24.ebuild b/app-shells/bash/bash-4.2_p24.ebuild index aac54414b91f..b79e9b9c3312 100644 --- a/app-shells/bash/bash-4.2_p24.ebuild +++ b/app-shells/bash/bash-4.2_p24.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.3 2012/03/18 23:57:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.4 2012/03/28 18:13:09 vapier Exp $ EAPI="1" @@ -105,6 +105,9 @@ src_compile() { # in the PM (and the readline ebuild itself preserves the old # libs during upgrades), linking against the system copy should # be safe. + # Exact cached version here doesn't really matter as long as it + # is at least what's in the DEPEND up above. + export ac_cv_rl_version=6.2 # Force linking with system curses ... the bundled termcap lib # sucks bad compared to ncurses. For the most part, ncurses @@ -113,7 +116,7 @@ src_compile() { use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash econf \ - --with-installed-readline \ + --with-installed-readline=. \ --with-curses \ $(use_with afs) \ $(use_enable net net-redirections) \ -- cgit v1.2.3-65-gdbad