diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2015-02-28 10:54:07 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2015-02-28 10:54:07 +0000 |
| commit | 0e0d56884355c9aa281f471b904d643bb95a551a (patch) | |
| tree | 055dd41ab36732feeb24ea95dc4c32e906845ee8 /sys-libs/csu | |
| parent | Fix depend rules in make which break due to unbundling of htslib, #541134; us... (diff) | |
| download | historical-0e0d56884355c9aa281f471b904d643bb95a551a.tar.gz historical-0e0d56884355c9aa281f471b904d643bb95a551a.tar.bz2 historical-0e0d56884355c9aa281f471b904d643bb95a551a.zip | |
Let the compiler determine if Availability.h is available for a more reliable result, bug #539964
Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89
Diffstat (limited to 'sys-libs/csu')
| -rw-r--r-- | sys-libs/csu/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/csu/Manifest | 10 | ||||
| -rw-r--r-- | sys-libs/csu/csu-85.ebuild | 29 |
3 files changed, 24 insertions, 21 deletions
diff --git a/sys-libs/csu/ChangeLog b/sys-libs/csu/ChangeLog index e1bcd70fd92a..ec562ffc3c3b 100644 --- a/sys-libs/csu/ChangeLog +++ b/sys-libs/csu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/csu # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/ChangeLog,v 1.8 2015/02/03 21:04:09 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/ChangeLog,v 1.9 2015/02/28 10:53:58 grobian Exp $ + + 28 Feb 2015; Fabian Groffen <grobian@gentoo.org> csu-85.ebuild: + Let the compiler determine if Availability.h is available for a more reliable + result, bug #539964 *csu-85 (03 Feb 2015) diff --git a/sys-libs/csu/Manifest b/sys-libs/csu/Manifest index 5ff65c7db083..db06f5a95059 100644 --- a/sys-libs/csu/Manifest +++ b/sys-libs/csu/Manifest @@ -5,13 +5,13 @@ AUX csu-85-darwin8.patch 639 SHA256 3794783805ea8a188ae1c051f0a6f7aaa1a75d1f8acf DIST Csu-79.tar.gz 12719 SHA256 d052e1daa1f5de7fc02e7e7cb8b79ee2eeaad0f321c0a70bea4fc7217e232ec2 SHA512 1d47cce40d400241bdd0a4c24e332f999cb7ae08bd43b08b88e9b5fd5a0a53c9752816b0e07c5b6ffb78f7b5bc24f45986c6a50c661bc5cdd15fee5e465da1bb WHIRLPOOL 74df2f9a9c42bc346f165d8db1d9b3862e2eab89f5b7112e73e27c41419258c0f9c203d7c13acbe43bf2f6c253d12d0f37139d98188773b807419f6bd6bdf4cc DIST Csu-85.tar.gz 13376 SHA256 f2291d7548da854322acf194a875609bfae96c2481738cf6fd1d89eea9ae057a SHA512 3cfeb7d37630fc9d6607da018b9ac1aeb3f41a4c190a67e7dc242ae48e7abd0026e25055b9459f2f187d3bb25644f516f079d1b2e943e8cb4cc6c132ad594467 WHIRLPOOL 96552600235fa7e098658e16e2afc1f95ead6bb705703faa6b8f792ec6bcacf9c5c7da5de729d98f83eae337d086750b536f7c1ee0f1a2d5223b53a18d5143f4 EBUILD csu-79.ebuild 1259 SHA256 ed46ae8bb3b214daa42de9f42a60f6ae7f54a5890bdc0e181a45c055b96306c2 SHA512 405e7f8b1ef6434daf5479236597721cd2f4da00176d0af309afb8c38a3cce8cc0cfb42d24679b05293d5f6824594c0f423fbe91e1ad337e574e008d2dc77364 WHIRLPOOL b752dcf804842ffb61276f5e076562d271da6f231c7df3b835f869f6112e052af5a1e0523652cc9ae83ee0f87229b2200146fcc5f7207bfed6bc5df866958df7 -EBUILD csu-85.ebuild 1374 SHA256 6d99cfa95b265005e6ada97f8f502a8746a6486c701146b746557ca7022a87be SHA512 83091f8835193aabc77f8e378b3115a0e9bdd354e8b8e64391239c51f9150c5d80e94564a5f9afca40c37bd91db19f2943d9d2b5ced8e981eacca487aff3b46f WHIRLPOOL 8be1c419601a2e5a1323c61248eb1de88f9046c9b5e75287c3bfd298b1036c72bd099bdea679d5d8a6c400a2bb02654d86fdd6633fa23ea986f3453ab463bba8 -MISC ChangeLog 1284 SHA256 c543b905c537c8cd717a0cfc232efd74d908dbc4d35e5e45dc0e9ca732b1838c SHA512 dc64f19adad22cfec53f2e42077d0049b53fa994d6eb53fb28bcb69c175d107cefd0e3c2376300e058fb3141600b10fd4b28e3aa555c747c73251b40f1083c86 WHIRLPOOL 3afde4a7519ba0c581221349d7fc2bc6352c265ece48dd9939de8a6b833c9817625ba1f60ac6b6c2cdaa064c1fbe3d25089822219c65327f19860b56d75673d0 +EBUILD csu-85.ebuild 1425 SHA256 9485431cb5a3852d9cfc544daa7b9266314affa8a35616ec3f170c7746a2bb34 SHA512 e873612cf62c2931c727d3b1ebb3124efe9888a6de5e2956236740dad3ae358b9a1c898573c39766fc928d941e19a2ac0daaf688ecd416373e14783ad7dbdb2b WHIRLPOOL 64b6661b01e1207c0fe75f63e70352314368e7c13457dab9d08143c74df3d179d2d75519bab463a12002e27cf785ba9df35307d625fa24a170b7cabc44c121df +MISC ChangeLog 1453 SHA256 bd1b5e1141ba837be2b25f26408565394abbd48bdb286d39f6a03dc1b4abbe6f SHA512 14f8867d7e50f8fdec6affe5fe87a97c8bd8d10afd6142a00e5e82151d3c6f4da0b5142db9618d17c9c8ca033e1663f44512a5670f693f8f3aaaec93b808b236 WHIRLPOOL 66536b8102b6d76e08e0c90b7e4eee678a6d15228f540ba2ef01829f45f7b4e49732e61539035850c65f056c6788028d263275bffcaa17e545b200d44cf09103 MISC metadata.xml 161 SHA256 eac14dbe95ed36c1455585d4c47b5f4ce921e4d5cc459f2f49c703926f4a91c0 SHA512 997f3c37368ef884169524d7a8123d77255807934e02650823be61ac10db031b553ec3f2f0cb479032468b32d9c196573bffcbc143ae005263d6acd7a5935e36 WHIRLPOOL 4538c8452ca577cc356b6a0cb2d22f8e87b86af9eb3d1da0a4905238e0bad28522fd1eb8843b2ab4817c210bb70efb03df4b06f77586497885c5c3a86f9d2915 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlTRN8sACgkQX3X2B8XHTokVIQCfTPdRONCi8KS1qoG26cU3bbrQ -kq0An2rAqNohqrojqiC7xYL7cNhA7+yw -=lJ8k +iEYEAREIAAYFAlTxnk0ACgkQX3X2B8XHTomFEgCglwiAp6OHTFXu0FgH6omrwhW3 +86oAmgL1L0OTR+9qLJ3kXG69jxQVAk0e +=xOmh -----END PGP SIGNATURE----- diff --git a/sys-libs/csu/csu-85.ebuild b/sys-libs/csu/csu-85.ebuild index fec699cdf02d..052e22dd7b3b 100644 --- a/sys-libs/csu/csu-85.ebuild +++ b/sys-libs/csu/csu-85.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/csu-85.ebuild,v 1.1 2015/02/03 21:04:09 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/csu-85.ebuild,v 1.2 2015/02/28 10:53:58 grobian Exp $ EAPI=5 -inherit eutils +inherit toolchain-funcs eutils DESCRIPTION="Darwin Csu (crt1.o) - Mac OS X 10.10 version" HOMEPAGE="http://www.opensource.apple.com/" @@ -25,19 +25,18 @@ src_prepare() { -e '/^CC = /d' \ Makefile || die - if [[ ${CHOST##*-darwin} -le 8 ]] ; then - # Availability.h missing - epatch "${FILESDIR}"/${P}-darwin8.patch - - if [[ ${CHOST} == powerpc* ]] ; then - # *must not* be compiled with -Os on PPC because that - # will optimize out - # _pointer_to__darwin_gcc3_preregister_frame_info which - # causes linker errors for large programs because the - # jump to ___darwin_gcc3_preregister_frame_info gets to - # be more than 16MB away - sed -i -e "s, -Os , -O ,g" Makefile || die - fi + # deal with Availability.h missing + echo "#include <Availability.h>" | $(tc-getCC) -o - -c -x c - >& /dev/null \ + || epatch "${FILESDIR}"/${P}-darwin8.patch + + if [[ ${CHOST} == powerpc* ]] ; then + # *must not* be compiled with -Os on PPC because that + # will optimize out + # _pointer_to__darwin_gcc3_preregister_frame_info which + # causes linker errors for large programs because the + # jump to ___darwin_gcc3_preregister_frame_info gets to + # be more than 16MB away + sed -i -e "s, -Os , -O ,g" Makefile || die fi } |