summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-01-05 17:47:23 +0000
committerMike Frysinger <vapier@gentoo.org>2014-01-05 17:47:23 +0000
commit3426bea32342844831cce86dd8d1c3158cc3978e (patch)
treeb8a33a75b302c53588df5c97ef4bf13f40544a29 /app-arch/bzip2
parentAdd ~sparc keyword. (diff)
downloadhistorical-3426bea32342844831cce86dd8d1c3158cc3978e.tar.gz
historical-3426bea32342844831cce86dd8d1c3158cc3978e.tar.bz2
historical-3426bea32342844831cce86dd8d1c3158cc3978e.zip
Only set -static in LDFLAGS for prog building #485690 by Greg Turner.
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'app-arch/bzip2')
-rw-r--r--app-arch/bzip2/ChangeLog7
-rw-r--r--app-arch/bzip2/Manifest22
-rw-r--r--app-arch/bzip2/bzip2-1.0.6-r4.ebuild9
3 files changed, 25 insertions, 13 deletions
diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index dface7712ef5..647a44cfa823 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-arch/bzip2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.108 2013/07/28 14:04:19 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.109 2014/01/05 17:47:18 vapier Exp $
+
+ 05 Jan 2014; Mike Frysinger <vapier@gentoo.org> bzip2-1.0.6-r4.ebuild:
+ Only set -static in LDFLAGS for prog building #485690 by Greg Turner.
28 Jul 2013; Alexis Ballier <aballier@gentoo.org> bzip2-1.0.6-r4.ebuild:
Fix blocker on emul-libs
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 5d8a61d1d400..9c40387dd418 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -13,14 +13,24 @@ DIST bzip2-1.0.6.tar.gz 782025 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8ede
EBUILD bzip2-1.0.6-r1.ebuild 2183 SHA256 4d7615ffc4a8b3fa39d5626a7c2fa3d18ec9e34577a6983bf0c87039f1c2bbe3 SHA512 4533d46cdf546a870405ee19478aabaf17e97271275711abb562e224eede97b2f2b8b514195e53398ae6e4dae206effbf30e121e883e6597992c869c18744107 WHIRLPOOL 5271b12d3fc5474e02a98b487e1fbdeadbf319c0153325df2fcdf85730c9507f7bf09b2003af15f62d588d2ecf86af5d0b316f0b426c09fd98622ab93e8a5183
EBUILD bzip2-1.0.6-r2.ebuild 2155 SHA256 664d950904d6a048cb299fc6eb93f18cb820c6fa009b32394d72b255c627eb15 SHA512 5187182a3260c6e131d72a78c86beceab6cadedac9e2410a7e0ae1e1fd4596baefbf457b415c8c3ad964d3a7d141a20dcab4bc95be031d76e5764d2ac0e429b3 WHIRLPOOL 261c2b2fdebac16d41cf5b8deb5f6f0c31f9aa715fac0366b53b28932be5f614990c837bd55cd29333bce1de5567c4cbbc968365eef4829207adac2a62b70ace
EBUILD bzip2-1.0.6-r3.ebuild 2426 SHA256 780f1ab3808463a24d83316973eea0b70477104f5f304ba66a4ef2a899695363 SHA512 ce8e0b2c93ce84efe8356348f24d4f3ff6877a6295e41ddd8848b46bc9c08be89ced4d1b17c7a669cd7361c41ed8d539be82b997a2048214f66d000fc5c3661c WHIRLPOOL 1bc5264b6840881bc67396795ae5d6f59a1b32d221827c547d0de183534fc6637aef6fdac92fa5f6b4b92c0ab74f89545d0445c1dbe3ef62c5ac629c671b664d
-EBUILD bzip2-1.0.6-r4.ebuild 2582 SHA256 f21b649b01a4f6940891db3615de5925669c73c1d9cae2f8705b7c48084fc81c SHA512 00087311aa3d6cdb88d535d8af660c1135b9b83bab2ff7d32c6be007dd1bb70d680defce476f7fd7429f84ce9ff46578eb5004c46eb0c0d83d3a7e1ba2106cfb WHIRLPOOL b5788077bb8f64d80b37f10f393d7ccde44ca089cda3bea592147ea66ddbae4b7d59bdfbc8ae50ae2b0d3eab80d7d50077f6ba3737533a2dd0305fb98ac9eac5
+EBUILD bzip2-1.0.6-r4.ebuild 2578 SHA256 2a67b917070e05bff9a6a19c1bdb35baaba0de458130e6479e876ede3c4e04bc SHA512 f1125185b05f6cc295e27e7d5d1c5e99a8d34738262779553f18d51d199aeead7b48998707ee0ec46b4584620eb892dce6ffa11cfea326a74811cdf52d5c8f7f WHIRLPOOL 58a5013afc3697d7eab007890982bcb050f1de7add95cc8edc3a57e579922f2f81d8f2688c4927fe6c0543d7aba971133e09fea10461db74546a05037a79bade
EBUILD bzip2-1.0.6.ebuild 2045 SHA256 c8d2600e7a05cfe24a1c252ea0a44f66ea6239dc9f87ee8d2c1fd06e32e69196 SHA512 5c8a274078b798d74f66f41fb44691b80f5c077d2f68fd0416fa8d1ab2f4a1fa73d0a6e87c8b8851fb98cd235fd4c10cbc72ef29512b1b27b841e8ed3ab1d725 WHIRLPOOL 8e2215e34cae5792eb025490a9dad88b6458f127ed2dd2abd09e8c973ae5c07e618237b3ff4da1eedebf277f6826cc2e12f859be9ba67df92199aa57e827b04f
-MISC ChangeLog 16470 SHA256 30059c497be4b30fafc7585e59ece578d66bc4e92397d6a5c7ec7fa2ae189b54 SHA512 b0cec9aa3c0fa22f989ce71ecab95d6ac53556eb165a7039071e756cd369d2c4e9aefddfe188a8015a7f3708365c253b51fcf1ee6dabd346b46c4036b475b641 WHIRLPOOL a68d470855d676984efe14c226bfc4d306a83d475c1de7ba6f1114831eef7be1a1e74c034420c765b4d10696e20bdf343769ca064a0cd4e878a684ab8aa8cd26
+MISC ChangeLog 16614 SHA256 961c30f998fb17deeef7ef3ea8227f0311ed890aab66b180311cf1da7e492ab0 SHA512 bbb9a247f0f6616c5460b15b011fe9bb341939041b980eba54bf4634b0a19aaf6e498785a0b9aa52435197778ad382209b6be42966588a19e7ad5765526d2892 WHIRLPOOL edf3cf2e52a8a283d96fdf5613b988d1b1ba510699b596b0bc504df184b3d5a6cd0c80769e639de2ded91b4057c012db960f3e763e597a60afa226971ef902da
MISC metadata.xml 241 SHA256 c9ef9f8a652ceb4655983472cec571c6762f53934447a83b38b311cf9e50254d SHA512 23ed7f7371d00caf97235d7a4f905286637cd286f9e8fc7c0413865dbab0772ff00dd9ecf65b5f199d694b42f032dc14ad9d3ac447cf1bb95124abf9203c0f1d WHIRLPOOL d687e040f4378e573d241a08b46ba7bd0f4c9d5ef4c9cf836a479102e5f8902e67244308747adf34b6bc605511244d37873b796f8089dc3e181a627302843d02
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlH1JOQACgkQvFcC4BYPU0oMvQCgjlOXZHUaleeO53W8cXfZlDfR
-1I4AoLI9y0lkt+EBY+Dj95GBX72lA244
-=v0v8
+iQIcBAEBCAAGBQJSyZqqAAoJEPGu1DbS6WIAZucP/3xO6EEGSbpM0r3bs3USlGOG
+Hle0OcsxJy8JMauJ3Z9HswkO+EQFgIIuXdtXLrZ6EgRViqtMPNlHrdPyw7y10FkV
+jt+to2+H74zN8Z8YPBvjS9fMDO6/syjfgkBDguaCiY1iBGXN6KFBfdzpZpCNwmA8
+Dxrr/vkhBCqdVaiq8vMTlWBOx+kauZ4J6KWZinYQTlzb56E5OTv6Q0ODFA81KPPJ
+lQy+HAH/ot8JU83HfvzJamDNtb4eVkdiylcmNUsBSgfBvdCgXRz4JNP3JD31pzcN
+B4XtyOAonpOE+QQs7KwuR6WQz/z5RJkOkFdfY/p+uzJ2FOuaTOEr9Ck3ahoCbRLs
+Hd6DOtJD8wyO1/lZ2qfm4j+2Y/Uu4eILVQ1fnrkdyE/3DUsMUmcEqf7/jO0JuXbM
++4uOlDqq99vXEUh+YrjJD8smPzKLUIfe0karxHeTc9mA48eeX4hMLf/MzFA+qlxU
+rmhHxCybTS+q1gO8HaEddpD0iX69Z90nnoTkBb84xXNe0mASHlZdogpg4vk+yW3+
+PNC9H1E+q2PeVific/iQSpCARo7uhoyONgiXqfQU7TnLgdC/70kXUdEZ8z1RnPNl
+0ce7/hG9EnWOQj3NGkTSQjIUwU1XNvWzEo9jnMFgWo10R68WmzYja7K2DY19La7n
+ht/MYUkNLrIJVNEvt7So
+=IEeS
-----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.6-r4.ebuild b/app-arch/bzip2/bzip2-1.0.6-r4.ebuild
index 3b608e6ee910..08973d837de1 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild,v 1.3 2013/07/28 14:04:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild,v 1.4 2014/01/05 17:47:18 vapier Exp $
# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
# (since we're building shared libs) ...
EAPI=4
-inherit eutils toolchain-funcs flag-o-matic multilib multilib-minimal
+inherit eutils toolchain-funcs multilib multilib-minimal
DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
HOMEPAGE="http://www.bzip.org/"
@@ -54,8 +54,7 @@ bemake() {
multilib_src_compile() {
bemake -f Makefile-libbz2_so all
- use static && append-flags -static
- bemake all
+ bemake all LDFLAGS="${LDFLAGS} $(usex static -static '')"
}
multilib_src_install() {