diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-09-11 16:06:45 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-09-11 16:06:45 +0000 |
| commit | 7925286b1fdd29b47222806b0b79140763ea2b78 (patch) | |
| tree | d092b4c8c507cdaa214f2aa0a8b2695d16228214 /app-shells | |
| parent | init-script fixes (diff) | |
| download | historical-7925286b1fdd29b47222806b0b79140763ea2b78.tar.gz historical-7925286b1fdd29b47222806b0b79140763ea2b78.tar.bz2 historical-7925286b1fdd29b47222806b0b79140763ea2b78.zip | |
Drop forced libedit static linking #334693.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/dash/ChangeLog | 3 | ||||
| -rw-r--r-- | app-shells/dash/Manifest | 10 | ||||
| -rw-r--r-- | app-shells/dash/dash-0.5.6.1-r1.ebuild | 16 |
3 files changed, 16 insertions, 13 deletions
diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog index f0fd9f477c2e..70bad8071f72 100644 --- a/app-shells/dash/ChangeLog +++ b/app-shells/dash/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 11 Sep 2010; Mike Frysinger <vapier@gentoo.org> dash-0.5.6.1-r1.ebuild: + Drop forced libedit static linking #334693. + + 11 Sep 2010; Mike Frysinger <vapier@gentoo.org> dash-0.5.6.1-r1.ebuild: Fix inverted static-libs depend #334693. 27 Aug 2010; Mike Frysinger <vapier@gentoo.org> dash-0.5.6.1-r1.ebuild: diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 51edce19caa8..7c8222e81fb5 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -10,13 +10,13 @@ DIST dash_0.5.5.1-2.diff.gz 30224 RMD160 8be771e0831ba3f19c51882b832f7af46f2f383 DIST dash_0.5.6.1-1~exp0.diff.gz 37971 RMD160 38841ddef07a42e09af2e37b7ba18ce67c1c34e9 SHA1 33945a0e5c025f38c18fe5086abf3d52310a731a SHA256 e8a4337849e4872d131ca3f1b823efcc6f40107e3ba40d5f1ae7bfcc34fd2fe6 EBUILD dash-0.5.4.11.ebuild 1606 RMD160 f08df2f60945a2d8d16ccacec8e37decb9ecbf40 SHA1 d10ba50f06caebb4dfe60163be0ceee743fce9e1 SHA256 2517819bd6e79725ac5e55cc2828208586f30a5882323ed47a7fabd103988f94 EBUILD dash-0.5.5.1.2.ebuild 1608 RMD160 694a7d13fd51599b7ee142e042a1cddbb172c5d8 SHA1 de6fe3e464dcb90938e6b6bb9cc16ad1f3c7f2d8 SHA256 1f3b0aa4a64fdedc1b58bfb0e2e71c269698e414bed4a610d880a846da6c031e -EBUILD dash-0.5.6.1-r1.ebuild 1769 RMD160 4c5d94a0c8ada120689ad2e48b72eaa20fed584e SHA1 eb059fffd40f8f065e67e4d35c197f351916d3d4 SHA256 a0d851ee8cbe42711ff691c3c82afe27975e1541f1753ce2f547311a7e472c2d -MISC ChangeLog 10734 RMD160 11bffb0c7b07c4cf986014367662866877dfe4ff SHA1 e83a0d2a5692f4077087f0ec4f935c429bf1e4f5 SHA256 4437c23bca11d2488d0feaa2b82a34963209a0237e44e9c457ed81833f139e3a +EBUILD dash-0.5.6.1-r1.ebuild 1712 RMD160 7802c0a076586e8ae357d3c8bfcb3c22a7b75a70 SHA1 3765173a956a126f25720365067b1ad20b54aa99 SHA256 9537b858b29f302883b296e458ebfbc2653552fd87f3f894eb6469008003c891 +MISC ChangeLog 10855 RMD160 e13753a8bee70a2f245f4ee5972d52bbcb656abf SHA1 7fd87a092666c570375604d59673684fcfc24796 SHA256 962494cd7f76c3418313b7e22ede2af62331f9d81cceee2923e5904965cecdd8 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iF4EAREIAAYFAkyLoy8ACgkQTwhj9JtAlp4MFgEAx/OR6wvah7k/kw0aaYBiHLWL -9rG/VvaoE/HNmljpdY4A/j+bu0umUPweVfhQCCqNUqsbUNoU2AwBrwfntLHCkQpD -=DsOd +iF4EAREIAAYFAkyLqXgACgkQTwhj9JtAlp6jDQD/ZE569ta+dm+ErokrmufBWV61 +IydmbvRGYpLbo9rR3Y0A/A7dXNksVAZt5DHAqKsVmsEKKi5V/vInHL0C/N0ve/Qf +=Fq6O -----END PGP SIGNATURE----- diff --git a/app-shells/dash/dash-0.5.6.1-r1.ebuild b/app-shells/dash/dash-0.5.6.1-r1.ebuild index 05d087e77ffb..349a7aba02ac 100644 --- a/app-shells/dash/dash-0.5.6.1-r1.ebuild +++ b/app-shells/dash/dash-0.5.6.1-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v 1.3 2010/09/11 15:39:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v 1.4 2010/09/11 16:06:45 vapier Exp $ EAPI="2" -inherit autotools eutils flag-o-matic +inherit autotools eutils flag-o-matic toolchain-funcs DEB_PV=${PV%.*} DEB_PATCH=${PV##*.} @@ -21,7 +21,10 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="libedit static" -DEPEND="libedit? ( dev-libs/libedit static? ( dev-libs/libedit[static-libs] ) )" +RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + libedit? ( static? ( dev-libs/libedit[static-libs] ) )" S=${WORKDIR}/${MY_P} @@ -35,11 +38,8 @@ src_prepare() { # Fix the invalid sort sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins - # Always statically link libedit in to ensure we always boot if it changes - # which it has done in the past. - local s="s/-ledit/-Wl,-Bstatic -ledit -Wl,-Bdynamic -lcurses/g" - use static && s="s/-ledit/-ledit -lcurses/g" - sed -i -e "${s}" configure.ac || die "Failed to sed configure.ac" + # Use pkg-config for libedit linkage + sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(use static && echo --static)\`:" configure.ac # May as well, as the debian patches force this anyway eautoreconf |