Guard Darwin version checks for Darwin CHOSTs only

(Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

6 files changed, 20 insertions, 15 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 67d081350d14..3256bd7e2340 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/binutils-apple
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.41 2015/02/04 17:33:20 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.42 2015/02/04 17:39:58 grobian Exp $
+
+  04 Feb 2015; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.2-r1.ebuild,
+  binutils-apple-4.2.ebuild, binutils-apple-4.3-r1.ebuild,
+  binutils-apple-4.3.ebuild, binutils-apple-5.1.ebuild:
+  Guard Darwin version checks for Darwin CHOSTs only
 
   04 Feb 2015; Fabian Groffen <grobian@gentoo.org>
   +files/ld64-241.9-lto-noremarks.patch, binutils-apple-6.1.ebuild:
diff --git a/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild
index 28f9f505e661..dbc6c5d13c10 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.2-r1.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-devel/binutils-apple/binutils-apple-4.2-r1.ebuild,v 1.2 2015/02/04 02:55:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild,v 1.3 2015/02/04 17:39:58 grobian Exp $
 
 EAPI="3"
 
@@ -93,7 +93,7 @@ src_prepare() {
 
 	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
 	# older systems
-	[[ ${CHOST#*-darwin} -le 8 ]] && \
+	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
 		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
 
 	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
@@ -191,7 +191,7 @@ src_configure() {
 	append-cppflags -DNDEBUG
 
 	CCTOOLS_OFLAG=
-	if [ ${CHOST#*-darwin} -le 8 ] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
 		# cctools expect to use UNIX03 struct member names.
 		# This is default on > 10.4. Activate it on <= 10.4 by defining
 		# __DARWIN_UNIX03 explicitly.
diff --git a/sys-devel/binutils-apple/binutils-apple-4.2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.2.ebuild
index d3d94b5bbde3..80f5244f2bcd 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.2.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-devel/binutils-apple/binutils-apple-4.2.ebuild,v 1.7 2015/01/31 02:33:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2.ebuild,v 1.8 2015/02/04 17:39:58 grobian Exp $
 
 EAPI="3"
 
@@ -77,7 +77,7 @@ src_prepare() {
 	ln -s ../../${LIBUNWIND}/src libunwind || die
 	cp ../../${LIBUNWIND}/include/*.h include/ || die
 	# mimic OS X Lion-style Availability.h macros
-	if [[ ${CHOST#*-darwin} -le 10 ]] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 10 ]] ; then
 		{
 			echo "#define __OSX_AVAILABLE_STARTING(x,y)  "
 			echo "#define __OSX_AVAILABLE_BUT_DEPRECATED(a,b,c,d)  "
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild
index 616504949029..7502d69b586e 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r1.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-devel/binutils-apple/binutils-apple-4.3-r1.ebuild,v 1.2 2015/02/04 02:55:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild,v 1.3 2015/02/04 17:39:58 grobian Exp $
 
 EAPI="3"
 
@@ -91,7 +91,7 @@ src_prepare() {
 
 	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
 	# older systems
-	[[ ${CHOST#*-darwin} -le 8 ]] && \
+	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
 		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
 
 	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
@@ -175,7 +175,7 @@ src_configure() {
 	append-cppflags -DNDEBUG
 
 	CCTOOLS_OFLAG=
-	if [ ${CHOST#*-darwin} -le 8 ] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
 		# cctools expect to use UNIX03 struct member names.
 		# This is default on > 10.4. Activate it on <= 10.4 by defining
 		# __DARWIN_UNIX03 explicitly.
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3.ebuild
index c391dacba6f5..474c32aa961b 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3.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-devel/binutils-apple/binutils-apple-4.3.ebuild,v 1.5 2015/01/31 02:33:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3.ebuild,v 1.6 2015/02/04 17:39:58 grobian Exp $
 
 EAPI="3"
 
@@ -77,7 +77,7 @@ src_prepare() {
 	ln -s ../../${LIBUNWIND}/src libunwind || die
 	cp ../../${LIBUNWIND}/include/*.h include/ || die
 	# mimic OS X Lion-style Availability.h macros
-	if [[ ${CHOST#*-darwin} -le 10 ]] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 10 ]] ; then
 		{
 			echo "#define __OSX_AVAILABLE_STARTING(x,y)  "
 			echo "#define __OSX_AVAILABLE_BUT_DEPRECATED(a,b,c,d)  "
diff --git a/sys-devel/binutils-apple/binutils-apple-5.1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1.ebuild
index 4e6fb36f7cc0..92adfdeeb1bb 100644
--- a/sys-devel/binutils-apple/binutils-apple-5.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1.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-devel/binutils-apple/binutils-apple-5.1.ebuild,v 1.2 2015/01/31 02:33:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-5.1.ebuild,v 1.3 2015/02/04 17:39:58 grobian Exp $
 
 EAPI="3"
 
@@ -101,7 +101,7 @@ src_prepare() {
 
 	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
 	# older systems
-	[[ ${CHOST#*-darwin} -le 8 ]] && \
+	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
 		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
 
 	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
@@ -200,11 +200,11 @@ src_configure() {
 	append-cppflags -DNDEBUG
 
 	# Block API and thus snapshots supported on >= 10.6
-	[ ${CHOST#*-darwin} -ge 10 ] && \
+	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
 		append-cppflags -DSUPPORT_SNAPSHOTS
 
 	CCTOOLS_OFLAG=
-	if [ ${CHOST#*-darwin} -le 8 ] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
 		# cctools expect to use UNIX03 struct member names.
 		# This is default on > 10.4. Activate it on <= 10.4 by defining
 		# __DARWIN_UNIX03 explicitly.