diff options
Diffstat (limited to 'sys-devel')
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 7fc30131f784..a03dbc3f0644 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 58c2d4ef98a3..682f644fc851 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 99e5309ef555..9743fd448554 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 da9d3200b895..e3022aab1b74 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 dfa6214b1377..b6ea3cdb633e 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 0227bb294f25..91916054da8a 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 82bc7258ff6b..66a832957ed8 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 3840d04f63a1..60ef905d77b8 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 abd7401197e7..0cdd4846c9db 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 d064f41fdc58..9973a8be5f57 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 70febd45e7fa..55be11280a7b 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 e177c38d3da4..db2756789691 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 |