Stop compiling unused libunwind, mimic Availability.h macros for pre OS X Lion hosts

Package-Manager: portage-2.2.01.19295-prefix/cvs/Darwin i386

3 files changed, 19 insertions, 10 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index b6015213dba2..34869d0df05a 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/binutils-apple
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.19 2011/09/21 20:41:49 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.20 2011/09/25 08:03:35 grobian Exp $
+
+  25 Sep 2011; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.1.ebuild:
+  Stop compiling unused libunwind, mimic Availability.h macros for pre OS X
+  Lion hosts
 
   21 Sep 2011; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.1.ebuild:
   Add keywords for 4.1, since it seems to work fine
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 2076fa78a096..e23f93292e84 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -56,13 +56,13 @@ EBUILD binutils-apple-3.2.3-r1.ebuild 6521 RMD160 6bd22707129894fc03f8949c79c1b0
 EBUILD binutils-apple-3.2.3-r2.ebuild 6669 RMD160 8a32c0be4ec8a6e8c89f5c2155fb172ebc4565e4 SHA1 9c495edc134edf36478897a7950510e7b57f92fe SHA256 17b6d484e33a20939d00a6bf496fe6aefa2920d21c4fbb6bbf359e853f754f7f
 EBUILD binutils-apple-3.2.6.ebuild 6670 RMD160 1a7df67ed733c1a22aca1414e7a2b3f1c1597d9c SHA1 6e5b37a6c5c63c87999f5dd67526cfd8936f44e8 SHA256 241af9c47b9165234672ee61466d4ba21af689cec6ab5e7f606d1f60355b30b8
 EBUILD binutils-apple-3.2.ebuild 5913 RMD160 47df8d8d2e207eb95e10359f35c2c5fd152f8938 SHA1 26b56881f56b63bc3f9b25aeae6c814f969f5dfd SHA256 41fb357219cdbb20f16200d05016c1866046f9a351994b738d6e0b7176f3488e
-EBUILD binutils-apple-4.1.ebuild 7508 RMD160 f8cb9492efdeb1e5df4293a56ae3a660b55e1d12 SHA1 540d0b080582ca1f84c6d739939bf93979e99e23 SHA256 d4e07e17a5ca403a336b7ae8e8d95c7c4fe3584f9ac279e7496b38bc9e0f27cb
-MISC ChangeLog 7929 RMD160 bba0f2a41c0006d5cbe86fba86b75c91423109dc SHA1 0af550bcc7014a3911eee426a75c212d88715172 SHA256 029063ad22b92eff83a2ec900d045fbf187ae215ca4f719e00a15ceaa42947a0
+EBUILD binutils-apple-4.1.ebuild 7717 RMD160 ee4150e083886f622e9e4cec632b8ef904abab78 SHA1 2b884fe9fe7e42f4b437693531b8eb943a2eba39 SHA256 32bf96e386857b58cc0611171e45f3525114b82624bbb75a547f1e6e9a7ed88e
+MISC ChangeLog 8097 RMD160 6e7ad426018504eee38fe4926fb4cd34c7582053 SHA1 40f52a32f0280c093d0134105431c715767d7cec SHA256 241def4cc6683af1220c8d035e9f010c5e6fd055983c5f6e167d95998d99abee
 MISC metadata.xml 250 RMD160 1d572689c02f6408ad8dfcfc955f8dfb7ec3a201 SHA1 dbd7759df5303c9dd998023753a3361206bad1e2 SHA256 f783a2767bd8eb2edebc0b1b1391fdcb461dcdb7a7c99dc1b82504c466688e79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk56TBMACgkQX3X2B8XHTokwIgCfWKulwx4VdfsQQGHQ8LO+s11Z
-2b0AoJ0x+R5FmczIoeB4ST8fsce/HElY
-=GfW+
+iEYEARECAAYFAk5+4FwACgkQX3X2B8XHTomY5gCgnsKIXHx9CCy4rj2xd97UG2I5
+lC0AniS+4qhNq6qeKpnVks5ytYOYu0Rp
+=SBSw
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
index 92b3e104170c..51fcdace491b 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.1.ebuild,v 1.2 2011/09/21 20:41:49 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.1.ebuild,v 1.3 2011/09/25 08:03:35 grobian Exp $
 
 EAPI="3"
 
@@ -73,10 +73,15 @@ src_prepare() {
 	mkdir -p include/llvm-c || die
 	cp "${WORKDIR}"/ld64-unwind/ld64-97.14-llvm-lto.h include/llvm-c/lto.h || die
 	# make libunwind sources known
-	#pushd "${WORKDIR}"/libunwind/include > /dev/null
 	ln -s ../../${LIBUNWIND}/src libunwind || die
 	cp ../../${LIBUNWIND}/include/*.h include/ || die
-	#popd > /dev/null
+	# mimic OS X Lion-style Availability.h macros
+	if [[ ${CHOST#*-darwin} -le 10 ]] ; then
+		{
+			echo "#define __OSX_AVAILABLE_STARTING(x,y)  "
+			echo "#define __OSX_AVAILABLE_BUT_DEPRECATED(a,b,c,d)  "
+		} > include/Availability.h
+	fi
 
 	echo '' > configure.h
 	echo '' > linker_opts
@@ -157,6 +162,7 @@ src_configure() {
 }
 
 compile_libunwind() {
+	# not used, just for testing, and possible use in the future
 	einfo "building ${LIBUNWIND}"
 	cd "${S}"/${LIBUNWIND}/src
 	emake DYLDINCS=-I../../${DYLD}/include || die
@@ -197,7 +203,6 @@ compile_cctools() {
 }
 
 src_compile() {
-	compile_libunwind
 	compile_ld64
 	compile_cctools
 }