[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-apple/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-apple/
Date: Sat, 10 Sep 2016 14:40:32 +0000 (UTC)	[thread overview]
Message-ID: <1473518427.49925c0dd0a4ab8599c955244cee2d0764cc08e9.grobian@gentoo> (raw)

commit:     49925c0dd0a4ab8599c955244cee2d0764cc08e9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 14:38:28 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 14:40:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49925c0d

sys-devel/binutils-apple: bump to EAPI=5 and remove all conditional code from global scope, bug #593392

Package-Manager: portage-2.2.28

 .../binutils-apple/binutils-apple-4.3-r2.ebuild    | 37 +++++++++++-----------
 .../binutils-apple/binutils-apple-5.1-r1.ebuild    | 37 +++++++++++-----------
 .../binutils-apple/binutils-apple-6.1-r1.ebuild    | 37 +++++++++++-----------
 .../binutils-apple/binutils-apple-6.3-r1.ebuild    | 35 ++++++++++----------
 .../binutils-apple/binutils-apple-7.0-r1.ebuild    | 35 ++++++++++----------
 sys-devel/binutils-apple/binutils-apple-7.0.ebuild | 35 ++++++++++----------
 .../binutils-apple/binutils-apple-7.1-r1.ebuild    | 35 ++++++++++----------
 sys-devel/binutils-apple/binutils-apple-7.1.ebuild | 35 ++++++++++----------
 .../binutils-apple/binutils-apple-7.2-r1.ebuild    | 35 ++++++++++----------
 sys-devel/binutils-apple/binutils-apple-7.2.ebuild | 35 ++++++++++----------
 .../binutils-apple/binutils-apple-7.3.1.ebuild     | 35 ++++++++++----------
 sys-devel/binutils-apple/binutils-apple-7.3.ebuild | 35 ++++++++++----------
 12 files changed, 219 insertions(+), 207 deletions(-)

diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
index 7fc3013..a03dbc3 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -32,27 +32,12 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )
 	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="4"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -185,6 +170,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG

diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
index 58c2d4e..682f644 100644
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -33,27 +33,12 @@ DEPEND="${RDEPEND}
 	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
 	libcxx? ( sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="5"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -197,6 +182,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	if [ "${CXX/*clang*/yes}" = "yes" ] ; then
 		if use libcxx ; then
 			append-cxxflags -stdlib=libc++

diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
index 99e5309..9743fd4 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -34,27 +34,12 @@ DEPEND="${RDEPEND}
 	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
 	libcxx? ( sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="6"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -198,6 +183,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	if [ "${CXX/*clang*/yes}" = "yes" ] ; then
 		if use libcxx ; then
 			append-cxxflags -stdlib=libc++

diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
index da9d320..e3022aa 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
@@ -35,27 +35,12 @@ DEPEND="${RDEPEND}
 	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
 	libcxx? ( sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="6"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -191,6 +176,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	if [[ ${CXX} == *clang* ]] ; then
 		if use libcxx ; then
 			append-cxxflags -stdlib=libc++

diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
index dfa6214..b6ea3cd 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
@@ -39,27 +39,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -198,6 +183,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG

diff --git a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
index 0227bb2..9191605 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
@@ -44,27 +44,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -197,6 +182,22 @@ src_prepare() {
 }
 
 src_configure() {
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG

diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
index 82bc725..66a8329 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
@@ -39,27 +39,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -198,6 +183,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG

diff --git a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
index 3840d04..60ef905 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
@@ -44,27 +44,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -201,6 +186,22 @@ src_configure() {
 	# what we want)
 	append-cppflags -DNDEBUG
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# Block API and thus snapshots supported on >= 10.6
 	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
 		append-cppflags -DSUPPORT_SNAPSHOTS

diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
index abd7401..0cdd484 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
@@ -40,27 +40,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -199,6 +184,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG

diff --git a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
index d064f41..9973a8b 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
@@ -44,27 +44,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -201,6 +186,22 @@ src_configure() {
 	# what we want)
 	append-cppflags -DNDEBUG
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# Block API and thus snapshots supported on >= 10.6
 	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
 		append-cppflags -DSUPPORT_SNAPSHOTS

diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
index 70febd4..55be112 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
@@ -41,27 +41,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -199,6 +184,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG

diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
index e177c38..db27567 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
@@ -41,27 +41,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
 SLOT="7"
 
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -199,6 +184,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG

next             reply	other threads:[~2016-09-10 14:40 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-10 14:40 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-27 14:44 [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-apple/ Fabian Groffen
2024-01-16 12:05 Fabian Groffen
2023-07-09 12:20 Fabian Groffen
2023-07-09 11:50 Fabian Groffen
2023-05-29 11:58 Fabian Groffen
2022-12-12 20:13 Fabian Groffen
2022-04-20  6:15 Fabian Groffen
2022-03-29 11:31 Fabian Groffen
2021-01-10 10:05 Fabian Groffen
2021-01-06 15:32 Fabian Groffen
2020-12-31 12:17 Fabian Groffen
2020-12-22 20:25 Fabian Groffen
2020-12-21 17:57 Fabian Groffen
2020-12-21  8:32 Fabian Groffen
2020-12-20 18:47 Fabian Groffen
2020-12-20 16:06 Fabian Groffen
2020-12-19 19:51 Fabian Groffen
2020-12-19 19:07 Fabian Groffen
2020-11-27 15:33 Fabian Groffen
2019-03-16 14:59 Fabian Groffen
2019-01-28 10:37 Fabian Groffen
2018-12-22 11:02 Fabian Groffen
2018-12-13 10:47 Fabian Groffen
2018-12-13  8:35 Fabian Groffen
2018-12-13  7:28 Fabian Groffen
2018-12-10 14:20 Fabian Groffen
2018-01-04 16:46 Fabian Groffen
2018-01-03 20:52 Fabian Groffen
2018-01-03 20:52 Fabian Groffen
2017-12-29 13:50 Fabian Groffen
2017-09-06 21:00 Michał Górny
2017-02-26 19:06 Fabian Groffen
2017-01-01 13:17 Fabian Groffen
2016-12-22  7:44 Fabian Groffen
2016-12-15 15:01 Fabian Groffen
2016-09-10 14:08 Fabian Groffen
2016-07-10 21:59 Patrick Lauer
2016-07-10 17:32 Fabian Groffen
2016-05-20 16:15 Fabian Groffen
2016-05-16 19:11 Fabian Groffen
2016-05-16 15:44 Fabian Groffen

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:7fc3013 dfblob:a03dbc3 dfblob:58c2d4e dfblob:682f644
dfblob:99e5309 dfblob:9743fd4 dfblob:da9d320 dfblob:e3022aa
dfblob:dfa6214 dfblob:b6ea3cd dfblob:0227bb2 dfblob:9191605
dfblob:82bc725 dfblob:66a8329 dfblob:3840d04 dfblob:60ef905
dfblob:abd7401 dfblob:0cdd484 dfblob:d064f41 dfblob:9973a8b
dfblob:70febd4 dfblob:55be112 dfblob:e177c38 dfblob:db27567 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-apple/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1473518427.49925c0dd0a4ab8599c955244cee2d0764cc08e9.grobian@gentoo \
    --to=grobian@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox