Take simpler approach to fix Availability.h header problem by Michael Weiser, bug...

Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

diff --git a/sys-libs/csu/ChangeLog b/sys-libs/csu/ChangeLog
index ec562ffc3c3bb78eaec41a9ea18d33a6e387a973..5ae49612782b14a7e3df9bf6721ad7f8c20a9137 100644 (file)
--- a/sys-libs/csu/ChangeLog
+++ b/sys-libs/csu/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2015/02/28 10:53:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/ChangeLog,v 1.10 2015/03/01 09:15:22 grobian Exp $
+
+  01 Mar 2015; Fabian Groffen <grobian@gentoo.org>
+  +files/csu-85-arm-availability.patch, -files/csu-85-darwin8.patch,
+  csu-85.ebuild:
+  Take simpler approach to fix Availability.h header problem by Michael Weiser,
+  bug #538602
 
   28 Feb 2015; Fabian Groffen <grobian@gentoo.org> csu-85.ebuild:
   Let the compiler determine if Availability.h is available for a more reliable

diff --git a/sys-libs/csu/Manifest b/sys-libs/csu/Manifest
index db06f5a9505996882bb4039edd9b7c6157a78841..30ca9a5b818bcc34945722c5fe67e9d60a07eee0 100644 (file)
--- a/sys-libs/csu/Manifest
+++ b/sys-libs/csu/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX csu-85-darwin8.patch 639 SHA256 3794783805ea8a188ae1c051f0a6f7aaa1a75d1f8acfdfb4728296299f4d3e89 SHA512 d687225bf224bde96eece968a7066fecd8b9c35df2de84e46dd8b591e971f53e1a1ae5ff67554a00d35eba708929f43ecc2b45c9feb76f7a6d6934bf3f808acc WHIRLPOOL 0b1c2430d38c3803d20a7959645e6ebb660654552c41ddf90807028b7ea7084f6aa2d03f573f937774097101b5b43b833c8ed5a0246a1aa2fc27c575372b176b
+AUX csu-85-arm-availability.patch 475 SHA256 596acf5e23295c67544d018e8ecb135074ec9cbb51d83d86413fccda1f6bbb3c SHA512 bcdf8153f80f2d873ceda05e3e0b2b798924e311e7038a7c52f2fec760d1c4b38f99eeae4cdd3bcc3ac64c1e123fb333a3d4be08fe36cb1d93823c15ea9c3742 WHIRLPOOL 7dcee120e8b16a530a0d9d156b834bf1eb1ead6d1d23fd73c3689d204f62e86de76cbeb9adb3c356148d6a31769a7b522785aa79eb3e69c091c6171239159c4b
 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 1425 SHA256 9485431cb5a3852d9cfc544daa7b9266314affa8a35616ec3f170c7746a2bb34 SHA512 e873612cf62c2931c727d3b1ebb3124efe9888a6de5e2956236740dad3ae358b9a1c898573c39766fc928d941e19a2ac0daaf688ecd416373e14783ad7dbdb2b WHIRLPOOL 64b6661b01e1207c0fe75f63e70352314368e7c13457dab9d08143c74df3d179d2d75519bab463a12002e27cf785ba9df35307d625fa24a170b7cabc44c121df
-MISC ChangeLog 1453 SHA256 bd1b5e1141ba837be2b25f26408565394abbd48bdb286d39f6a03dc1b4abbe6f SHA512 14f8867d7e50f8fdec6affe5fe87a97c8bd8d10afd6142a00e5e82151d3c6f4da0b5142db9618d17c9c8ca033e1663f44512a5670f693f8f3aaaec93b808b236 WHIRLPOOL 66536b8102b6d76e08e0c90b7e4eee678a6d15228f540ba2ef01829f45f7b4e49732e61539035850c65f056c6788028d263275bffcaa17e545b200d44cf09103
+EBUILD csu-85.ebuild 1378 SHA256 5818adc4b88fe23c1dad106f9e6794355c1bdb2d0b676194abcbc1bd48495f21 SHA512 3e0bf1527361f9ccad975968bc25ee21bb3ba50145910a0337e1f6c17f71b89c9218aef8d8e27f7f65718310d28e1054bed113994b6a5092364d82186092b02a WHIRLPOOL b52b8dd8ebb7738c021e2e031849ec74d3a4d959fc19a27d08636c44a2741f0fb0a70712c0f705492712e403d956b0a159496f3809acb37bef11a3749244338b
+MISC ChangeLog 1686 SHA256 09ab17cc9adceee0b0bf7ac62722099004795aefb7fc219f78ec113780e7d16d SHA512 41bbab3a0776136d612c0be3012c6504d3c6d43bf40583094d6b3499fa4a4c4d58250a19b44aa5bf18e17eace0194527842efdcec970dc981d35a5731336239b WHIRLPOOL 1ee583adfe7acf0196563fbc91b0903272814dd52a1299f9266fca4acf6a68d1cc6875b05ab34d6db89111ee4071141c9eb1773d224bb28074923a794871348a
 MISC metadata.xml 161 SHA256 eac14dbe95ed36c1455585d4c47b5f4ce921e4d5cc459f2f49c703926f4a91c0 SHA512 997f3c37368ef884169524d7a8123d77255807934e02650823be61ac10db031b553ec3f2f0cb479032468b32d9c196573bffcbc143ae005263d6acd7a5935e36 WHIRLPOOL 4538c8452ca577cc356b6a0cb2d22f8e87b86af9eb3d1da0a4905238e0bad28522fd1eb8843b2ab4817c210bb70efb03df4b06f77586497885c5c3a86f9d2915
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTxnk0ACgkQX3X2B8XHTomFEgCglwiAp6OHTFXu0FgH6omrwhW3
-86oAmgL1L0OTR+9qLJ3kXG69jxQVAk0e
-=xOmh
+iEYEAREIAAYFAlTy2KsACgkQX3X2B8XHTonxDgCffitr2FLJFI7MQyRkZOuPghZC
+XtEAoJzCaLGt2XQyI0bfMd+Dq4FyhUWd
+=PVmX
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/csu/csu-85.ebuild b/sys-libs/csu/csu-85.ebuild
index 052e22dd7b3b27f9212f7e5d132cedb8034a825f..8db643476cbebb96568436c36b9ef0dd830f2a0e 100644 (file)
--- a/sys-libs/csu/csu-85.ebuild
+++ b/sys-libs/csu/csu-85.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2015/02/28 10:53:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/csu-85.ebuild,v 1.3 2015/03/01 09:15:22 grobian Exp $
 
 EAPI=5
 
@@ -25,9 +25,8 @@ src_prepare() {
                -e '/^CC = /d' \
                Makefile || die
 
-       # deal with Availability.h missing
-       echo "#include <Availability.h>" | $(tc-getCC) -o - -c -x c - >& /dev/null \
-               || epatch "${FILESDIR}"/${P}-darwin8.patch
+       # only require Availability.h for arm, bugs #538602, #539964
+       epatch "${FILESDIR}"/${P}-arm-availability.patch
 
        if [[ ${CHOST} == powerpc* ]] ; then
                # *must not* be compiled with -Os on PPC because that

diff --git a/sys-libs/csu/files/csu-85-arm-availability.patch b/sys-libs/csu/files/csu-85-arm-availability.patch
new file mode 100644 (file)
index 0000000..6d3f3cf
--- /dev/null
+++ b/sys-libs/csu/files/csu-85-arm-availability.patch
@@ -0,0 +1,18 @@
+Guard inclusion of Availability.h so that it only happens on arm where it's
+actuallty used so it doesn't cause failures on old OS X where Availability.h
+doesn't exist yet.
+
+Michael Weiser <michael@weiser.dinsnail.net>
+
+--- Csu-85/start.s.orig        2013-10-09 01:11:47.000000000 +0200
++++ Csu-85/start.s     2015-02-11 20:34:04.000000000 +0100
+@@ -22,7 +22,9 @@
+  * @APPLE_LICENSE_HEADER_END@
+  */
+ 
++#ifdef __arm__
+ #include <Availability.h>
++#endif
+ 
+ #if __ppc__ && __DYNAMIC__
+ //

diff --git a/sys-libs/csu/files/csu-85-darwin8.patch b/sys-libs/csu/files/csu-85-darwin8.patch
deleted file mode 100644 (file)
index a62a6f6..0000000
--- a/sys-libs/csu/files/csu-85-darwin8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Csu-85/start.s
-+++ Csu-85/start.s
-@@ -22,7 +22,10 @@
-  * @APPLE_LICENSE_HEADER_END@
-  */
- 
--#include <Availability.h>
-+/* This is fun: We could use AvailabilityMacros.h to check if we're compiling
-+ * for < 10.5 and not inclue Availability.h then. But we are compiling with
-+ * deployment target 10.5 *on this host* where we still won't have
-+ * Availability.h. So just drop the include */
- 
- #if __ppc__ && __DYNAMIC__
- //
-@@ -203,7 +206,7 @@
-       cmp     r4, #0
-       bne     Lapple                  
-                                       // "apple" param now in r3
--#if __STATIC__ || ((__IPHONE_OS_VERSION_MIN_REQUIRED >= 30100) && !__ARM_ARCH_4T__)
-+#if __STATIC__
-       bl      _main
-       b       _exit
- #else