diff options
author | Fabian Groffen <grobian@gentoo.org> | 2012-06-12 17:34:33 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2012-06-12 17:34:33 +0000 |
commit | 474ac63e878ccef1445453596fa758db9e797030 (patch) | |
tree | b5278601d72a28f06ed62a2d1db88b02758583fb /sys-devel/binutils-apple | |
parent | Version bump. (diff) | |
download | gentoo-2-474ac63e878ccef1445453596fa758db9e797030.tar.gz gentoo-2-474ac63e878ccef1445453596fa758db9e797030.tar.bz2 gentoo-2-474ac63e878ccef1445453596fa758db9e797030.zip |
Cleanup old versions
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386)
Diffstat (limited to 'sys-devel/binutils-apple')
11 files changed, 10 insertions, 1820 deletions
diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog index 2d851f11016d..cd8c3e228d56 100644 --- a/sys-devel/binutils-apple/ChangeLog +++ b/sys-devel/binutils-apple/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-devel/binutils-apple # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.31 2012/03/05 11:47:13 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.32 2012/06/12 17:34:33 grobian Exp $ + + 12 Jun 2012; Fabian Groffen <grobian@gentoo.org> -binutils-apple-3.1.1.ebuild, + -binutils-apple-3.2-r1.ebuild, -binutils-apple-3.2.2.ebuild, + -binutils-apple-3.2.3-r1.ebuild, -binutils-apple-3.2.3-r2.ebuild, + -binutils-apple-3.2.ebuild, -binutils-apple-4.1.ebuild, + -files/binutils-apple-3.2-armv7-defines.patch, + -files/binutils-apple-3.2-ld64-Makefile, + -files/binutils-apple-3.2.3-as-dir.patch: + Cleanup old versions 05 Mar 2012; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.3.ebuild: Remove PowerPC tweaks, Apple removed entire PowerPC support from ld in diff --git a/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild deleted file mode 100644 index b777dfee4c2c..000000000000 --- a/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild,v 1.3 2010/03/21 19:33:06 grobian Exp $ - -EAPI="3" - -inherit eutils flag-o-matic toolchain-funcs - -RESTRICT="test mirror" # the test suite will test what's installed. - -LD64=ld64-85.2.2 -CCTOOLS=cctools-698 - -DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.1.1" -HOMEPAGE="http://www.opensource.apple.com/darwinsource/" -SRC_URI="http://www.gentoo.org/~grobian/distfiles/${LD64}.tar.gz - http://www.gentoo.org/~grobian/distfiles/${CCTOOLS}.tar.gz" - -LICENSE="APSL-2" -KEYWORDS="~ppc-macos ~x86-macos" -IUSE="test" -SLOT="0" - -DEPEND="sys-devel/binutils-config - test? ( >=dev-lang/perl-5.8.8 )" -RDEPEND="${DEPEND}" - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } - -if is_cross ; then - SLOT="${CTARGET}" -else - SLOT="0" -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 - -S=${WORKDIR} - -prepare_ld64() { - cd "${S}"/${LD64}/src - cp "${FILESDIR}"/Makefile . - - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64}\\n\"" - sed -i \ - -e '/^#define LTO_SUPPORT 1/s:1:0:' \ - ObjectDump.cpp - echo '#undef LTO_SUPPORT' > configure.h - echo "char ldVersionString[] = ${VER_STR};" > version.cpp - - # clean up test suite - cd "${S}"/${LD64}/unit-tests/test-cases - local c - - # we don't have llvm - ((++c)); rm -rf llvm-integration; - - # we don't have dtrace - ((++c)); rm -rf dtrace-static-probes-coalescing; - ((++c)); rm -rf dtrace-static-probes; - - # a file is missing - ((++c)); rm -rf eh-coalescing-r - - # we don't do universal binaries - ((++c)); rm -rf blank-stubs; - - # looks like a problem with apple's result-filter.pl - ((++c)); rm -rf implicit-common3; - ((++c)); rm -rf order_file-ans; - - # TODO no idea what goes wrong here - ((++c)); rm -rf dwarf-debug-notes; - - elog "Deleted $c tests that were bound to fail" -} - -src_prepare() { - prepare_ld64 - cd "${S}" - - epatch "${FILESDIR}"/${P}-as.patch - epatch "${FILESDIR}"/${P}-as-dir.patch - epatch "${FILESDIR}"/${P}-ranlib.patch - epatch "${FILESDIR}"/${P}-libtool-ranlib.patch - epatch "${FILESDIR}"/${P}-nmedit.patch - epatch "${FILESDIR}"/${P}-no-efi-man.patch - epatch "${FILESDIR}"/${P}-no-headers.patch - epatch "${FILESDIR}"/${P}-no-oss-dir.patch - epatch "${FILESDIR}"/${P}-testsuite.patch - - # -pg is used and the two are incompatible - filter-flags -fomit-frame-pointer -} - -compile_ld64() { - cd "${S}"/${LD64}/src - # 'struct linkedit_data_command' is defined in mach-o/loader.h on leopard, - # but not on tiger. - [[ ${CHOST} == *-apple-darwin8 ]] && \ - append-flags -isystem "${S}"/${CCTOOLS}/include/ - emake - use test && emake build_test -} - -compile_cctools() { - cd "${S}"/${CCTOOLS} - emake \ - LTO= \ - EFITOOLS= \ - COMMON_SUBDIRS='libstuff ar misc otool' \ - RC_CFLAGS="${CFLAGS}" - cd "${S}"/${CCTOOLS}/as - # the errors can be ignored - emake -k \ - BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" - emake \ - BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" -} - -src_compile() { - tc-export CC CXX - compile_cctools - compile_ld64 -} - -install_ld64() { - exeinto ${BINPATH} - doexe "${S}"/${LD64}/src/{ld64,rebase} - dosym ld64 ${BINPATH}/ld - insinto ${DATAPATH}/man/man1 - doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1 -} - -install_cctools() { - cd "${S}"/${CCTOOLS} - emake install_all_but_headers \ - EFITOOLS= \ - COMMON_SUBDIRS='ar misc otool' \ - DSTROOT=\"${D}\" \ - BINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCBINDIR=\"${EPREFIX}\"${BINPATH} \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \ - MANDIR=\"${EPREFIX}\"${DATAPATH}/man/ - cd "${S}"/${CCTOOLS}/as - emake install \ - BUILD_OBSOLETE_ARCH= \ - DSTROOT=\"${D}\" \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LIBDIR=\"${EPREFIX}\"${LIBPATH} - - cd "${ED}"${BINPATH} - insinto ${DATAPATH}/man/man1 - local skips manpage - # ar brings an up-to-date manpage with it - skips=( ar ) - for bin in *; do - for skip in ${skips[@]}; do - if [[ ${bin} == ${skip} ]]; then - continue 2; - fi - done - manpage=${S}/${CCTOOLS}/man/${bin}.1 - if [[ -f "${manpage}" ]]; then - doins "${manpage}" - fi - done - insinto ${DATAPATH}/man/man5 - doins "${S}"/${CCTOOLS}/man/*.5 -} - -src_test() { - cd "${S}"/${LD64}/unit-tests/test-cases - # need host arch, since GNU arch doesn't do what Apple's does - tc-export CC CXX - perl ../bin/make-recursive.pl \ - ARCH="$(/usr/bin/arch)" \ - RELEASEDIR="${S}"/${LD64}/src \ - | perl ../bin/result-filter.pl -} - -src_install() { - install_ld64 - install_cctools - - cd "${S}" - insinto /etc/env.d/binutils - cat <<-EOF > env.d - TARGET="${CHOST}" - VER="${PV}" - FAKE_TARGETS="${CHOST}" - EOF - newins env.d ${CHOST}-${PV} -} - -pkg_postinst() { - binutils-config ${CHOST}-${PV} -} diff --git a/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild deleted file mode 100644 index 1f916b2556b3..000000000000 --- a/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild,v 1.4 2010/05/02 14:37:45 grobian Exp $ - -EAPI="3" - -inherit eutils flag-o-matic toolchain-funcs - -RESTRICT="test" # the test suite will test what's installed. - -# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html -LD64=ld64-95.2.12 -CCTOOLS=cctools-750 -UNWIND=binutils-apple-3.2-unwind-patches-2 - -DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2" -HOMEPAGE="http://www.opensource.apple.com/darwinsource/" -SRC_URI="http://www.gentoo.org/~grobian/distfiles/${LD64}.tar.gz - http://www.gentoo.org/~grobian/distfiles/${CCTOOLS}.tar.gz - http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz" - -LICENSE="APSL-2" -KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" -IUSE="test" -SLOT="0" - -RDEPEND="sys-devel/binutils-config - test? ( >=dev-lang/perl-5.8.8 )" -DEPEND="${RDEPEND} - >=sys-devel/gcc-apple-4.2.1" - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } - -if is_cross ; then - SLOT="${CTARGET}" -else - SLOT="0" -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 - -S=${WORKDIR} - -src_prepare() { - cd "${S}"/${CCTOOLS} - epatch "${FILESDIR}"/${PN}-3.1.1-as.patch - epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch - epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch - epatch "${FILESDIR}"/${P}-armv7-defines.patch - - cd "${S}"/${LD64}/src - cp "${FILESDIR}"/${LD64}-Makefile Makefile - - ln -s ../../${CCTOOLS}/include - cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/ - - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" - echo '#undef LTO_SUPPORT' > configure.h - echo '' > linker_opts - echo "char ldVersionString[] = ${VER_STR};" > version.cpp - - epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch - [[ ${CHOST} == *-darwin10 ]] && \ - epatch "${WORKDIR}"/ld64-unwind/${LD64}-message-before-abort.patch - [[ ${CHOST} == powerpc*-darwin* ]] && \ - epatch "${FILESDIR}"/${LD64}-darwin8-no-mlong-branch-warning.patch - - # clean up test suite - cd "${S}"/${LD64} - epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch - - cd "${S}"/${LD64}/unit-tests/test-cases - local c - - # we don't have llvm - ((++c)); rm -rf llvm-integration; - - # we don't have dtrace - ((++c)); rm -rf dtrace-static-probes-coalescing; - ((++c)); rm -rf dtrace-static-probes; - - # a file is missing - ((++c)); rm -rf eh-coalescing-r - - # we don't do universal binaries - ((++c)); rm -rf blank-stubs; - - # looks like a problem with apple's result-filter.pl - ((++c)); rm -rf implicit-common3; - ((++c)); rm -rf order_file-ans; - - # TODO no idea what goes wrong here - ((++c)); rm -rf dwarf-debug-notes; - - einfo "Deleted $c tests that were bound to fail" - - cd "${S}" - ebegin "cleaning Makefiles from unwanted CFLAGS" - find . -name "Makefile" -print0 | xargs -0 sed \ - -i \ - -e 's/ -g / /g' \ - -e 's/^OFLAG =.*$/OFLAG =/' \ - -e 's/install -c -s/install/g' - eend $? - - # -pg is used and the two are incompatible - filter-flags -fomit-frame-pointer -} - -compile_ld64() { - cd "${S}"/${LD64}/src - # remove antiquated copy that's available on any OSX system and - # breaks ld64 compilation - mv include/mach-o/dyld.h{,.disable} - emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ - || die "emake failed for ld64" - use test && emake build_test - # restore, it's necessary for cctools' install - mv include/mach-o/dyld.h{.disable,} -} - -compile_cctools() { - cd "${S}"/${CCTOOLS} - emake \ - LTO= \ - TRIE= \ - EFITOOLS= \ - COMMON_SUBDIRS='libstuff ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - || die "emake failed for the cctools" - cd "${S}"/${CCTOOLS}/as - emake \ - BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - || die "emake failed for as" -} - -src_compile() { - tc-export CC CXX AR - compile_cctools - compile_ld64 -} - -install_ld64() { - exeinto ${BINPATH} - doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump} - dosym ld64 ${BINPATH}/ld - insinto ${DATAPATH}/man/man1 - doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1 -} - -install_cctools() { - cd "${S}"/${CCTOOLS} - emake install_all_but_headers \ - EFITOOLS= \ - COMMON_SUBDIRS='ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - DSTROOT=\"${D}\" \ - BINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCBINDIR=\"${EPREFIX}\"${BINPATH} \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \ - MANDIR=\"${EPREFIX}\"${DATAPATH}/man/ - cd "${S}"/${CCTOOLS}/as - emake install \ - BUILD_OBSOLETE_ARCH= \ - DSTROOT=\"${D}\" \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LIBDIR=\"${EPREFIX}\"${LIBPATH} - - cd "${ED}"${BINPATH} - insinto ${DATAPATH}/man/man1 - local skips manpage - # ar brings an up-to-date manpage with it - skips=( ar ) - for bin in *; do - for skip in ${skips[@]}; do - if [[ ${bin} == ${skip} ]]; then - continue 2; - fi - done - manpage=${S}/${CCTOOLS}/man/${bin}.1 - if [[ -f "${manpage}" ]]; then - doins "${manpage}" - fi - done - insinto ${DATAPATH}/man/man5 - doins "${S}"/${CCTOOLS}/man/*.5 -} - -src_test() { - einfo "Running unit tests" - cd "${S}"/${LD64}/unit-tests/test-cases - # need host arch, since GNU arch doesn't do what Apple's does - tc-export CC CXX - perl ../bin/make-recursive.pl \ - ARCH="$(/usr/bin/arch)" \ - RELEASEDIR="${S}"/${LD64}/src \ - | perl ../bin/result-filter.pl -} - -src_install() { - install_ld64 - install_cctools - - cd "${S}" - insinto /etc/env.d/binutils - cat <<-EOF > env.d - TARGET="${CHOST}" - VER="${PV}" - FAKE_TARGETS="${CHOST}" - EOF - newins env.d ${CHOST}-${PV} -} - -pkg_postinst() { - binutils-config ${CHOST}-${PV} -} diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild deleted file mode 100644 index d564ff155a42..000000000000 --- a/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild,v 1.1 2010/05/18 10:42:10 grobian Exp $ - -EAPI="3" - -inherit eutils flag-o-matic toolchain-funcs - -RESTRICT="test" # the test suite will test what's installed. - -LD64=ld64-97.2 -CCTOOLS=cctools-773 -# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html -UNWIND=binutils-apple-3.2-unwind-patches-3 - -DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.2" -HOMEPAGE="http://www.opensource.apple.com/darwinsource/" -SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz - http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz - http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz" - -LICENSE="APSL-2" -KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" -IUSE="test" -SLOT="0" - -RDEPEND="sys-devel/binutils-config - test? ( >=dev-lang/perl-5.8.8 )" -DEPEND="${RDEPEND} - >=sys-devel/gcc-apple-4.2.1" - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } - -if is_cross ; then - SLOT="${CTARGET}" -else - SLOT="0" -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 - -S=${WORKDIR} - -src_prepare() { - cd "${S}"/${CCTOOLS} - epatch "${FILESDIR}"/${PN}-3.2.2-as.patch - epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch - epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch - - cd "${S}"/${LD64}/src - cp "${FILESDIR}"/ld64-95.2.12-Makefile Makefile - - ln -s ../../${CCTOOLS}/include - cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/ - - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" - echo '#undef LTO_SUPPORT' > configure.h - echo '' > linker_opts - echo "char ldVersionString[] = ${VER_STR};" > version.cpp - - epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch - [[ ${CHOST} == *-darwin10 ]] && \ - epatch "${WORKDIR}"/ld64-unwind/${LD64}-message-before-abort.patch - [[ ${CHOST} == powerpc*-darwin* ]] && \ - epatch "${FILESDIR}"/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch - - # clean up test suite - cd "${S}"/${LD64} - epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch - - cd "${S}"/${LD64}/unit-tests/test-cases - local c - - # we don't have llvm - ((++c)); rm -rf llvm-integration; - - # we don't have dtrace - ((++c)); rm -rf dtrace-static-probes-coalescing; - ((++c)); rm -rf dtrace-static-probes; - - # a file is missing - ((++c)); rm -rf eh-coalescing-r - - # we don't do universal binaries - ((++c)); rm -rf blank-stubs; - - # looks like a problem with apple's result-filter.pl - ((++c)); rm -rf implicit-common3; - ((++c)); rm -rf order_file-ans; - - # TODO no idea what goes wrong here - ((++c)); rm -rf dwarf-debug-notes; - - einfo "Deleted $c tests that were bound to fail" - - cd "${S}" - ebegin "cleaning Makefiles from unwanted CFLAGS" - find . -name "Makefile" -print0 | xargs -0 sed \ - -i \ - -e 's/ -g / /g' \ - -e 's/^OFLAG =.*$/OFLAG =/' \ - -e 's/install -c -s/install/g' - eend $? - - # -pg is used and the two are incompatible - filter-flags -fomit-frame-pointer -} - -compile_ld64() { - cd "${S}"/${LD64}/src - # remove antiquated copy that's available on any OSX system and - # breaks ld64 compilation - mv include/mach-o/dyld.h{,.disable} - emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ - || die "emake failed for ld64" - use test && emake build_test - # restore, it's necessary for cctools' install - mv include/mach-o/dyld.h{.disable,} -} - -compile_cctools() { - cd "${S}"/${CCTOOLS} - emake \ - LTO= \ - TRIE= \ - EFITOOLS= \ - COMMON_SUBDIRS='libstuff ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - || die "emake failed for the cctools" - cd "${S}"/${CCTOOLS}/as - emake \ - BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - || die "emake failed for as" -} - -src_compile() { - tc-export CC CXX AR - compile_cctools - compile_ld64 -} - -install_ld64() { - exeinto ${BINPATH} - doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump} - dosym ld64 ${BINPATH}/ld - insinto ${DATAPATH}/man/man1 - doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1 -} - -install_cctools() { - cd "${S}"/${CCTOOLS} - emake install_all_but_headers \ - EFITOOLS= \ - COMMON_SUBDIRS='ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - DSTROOT=\"${D}\" \ - BINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCBINDIR=\"${EPREFIX}\"${BINPATH} \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \ - MANDIR=\"${EPREFIX}\"${DATAPATH}/man/ - cd "${S}"/${CCTOOLS}/as - emake install \ - BUILD_OBSOLETE_ARCH= \ - DSTROOT=\"${D}\" \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LIBDIR=\"${EPREFIX}\"${LIBPATH} - - cd "${ED}"${BINPATH} - insinto ${DATAPATH}/man/man1 - local skips manpage - # ar brings an up-to-date manpage with it - skips=( ar ) - for bin in *; do - for skip in ${skips[@]}; do - if [[ ${bin} == ${skip} ]]; then - continue 2; - fi - done - manpage=${S}/${CCTOOLS}/man/${bin}.1 - if [[ -f "${manpage}" ]]; then - doins "${manpage}" - fi - done - insinto ${DATAPATH}/man/man5 - doins "${S}"/${CCTOOLS}/man/*.5 -} - -src_test() { - einfo "Running unit tests" - cd "${S}"/${LD64}/unit-tests/test-cases - # need host arch, since GNU arch doesn't do what Apple's does - tc-export CC CXX - perl ../bin/make-recursive.pl \ - ARCH="$(/usr/bin/arch)" \ - RELEASEDIR="${S}"/${LD64}/src \ - | perl ../bin/result-filter.pl -} - -src_install() { - install_ld64 - install_cctools - - cd "${S}" - insinto /etc/env.d/binutils - cat <<-EOF > env.d - TARGET="${CHOST}" - VER="${PV}" - FAKE_TARGETS="${CHOST}" - EOF - newins env.d ${CHOST}-${PV} -} - -pkg_postinst() { - binutils-config ${CHOST}-${PV} -} diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild deleted file mode 100644 index d6c86ab14de9..000000000000 --- a/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild,v 1.2 2010/08/16 07:39:37 grobian Exp $ - -EAPI="3" - -inherit eutils flag-o-matic toolchain-funcs - -RESTRICT="test" # the test suite will test what's installed. - -LD64=ld64-97.14 -CCTOOLS=cctools-782 -# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html -UNWIND=binutils-apple-3.2-unwind-patches-5 - -DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.3" -HOMEPAGE="http://www.opensource.apple.com/darwinsource/" -SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz - http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz - http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz" - -LICENSE="APSL-2" -KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" -IUSE="test" -SLOT="0" - -RDEPEND="sys-devel/binutils-config - test? ( >=dev-lang/perl-5.8.8 )" -DEPEND="${RDEPEND} - >=sys-devel/gcc-apple-4.2.1" - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } - -if is_cross ; then - SLOT="${CTARGET}" -else - SLOT="0" -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 - -S=${WORKDIR} - -src_prepare() { - cd "${S}"/${CCTOOLS} - epatch "${FILESDIR}"/${PN}-3.2.2-as.patch - epatch "${FILESDIR}"/${PN}-3.2.3-as-dir.patch - epatch "${FILESDIR}"/${PN}-3.2.3-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch - - cd "${S}"/${LD64}/src - cp "${FILESDIR}"/ld64-95.2.12-Makefile Makefile - - ln -s ../../${CCTOOLS}/include - cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/ - mkdir -p include/llvm-c || die - cp "${WORKDIR}"/ld64-unwind/${LD64}-llvm-lto.h include/llvm-c/lto.h || die - cp other/prune_trie.h include/mach-o/ || die - - echo '' > configure.h - echo '' > linker_opts - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" - echo "char ldVersionString[] = ${VER_STR};" > version.cpp - - epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch - [[ ${CHOST} == powerpc*-darwin* ]] && \ - epatch "${FILESDIR}"/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch - sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die - - # clean up test suite - cd "${S}"/${LD64} - epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch - - cd "${S}"/${LD64}/unit-tests/test-cases - local c - - # we don't have llvm - ((++c)); rm -rf llvm-integration; - - # we don't have dtrace - ((++c)); rm -rf dtrace-static-probes-coalescing; - ((++c)); rm -rf dtrace-static-probes; - - # a file is missing - ((++c)); rm -rf eh-coalescing-r - - # we don't do universal binaries - ((++c)); rm -rf blank-stubs; - - # looks like a problem with apple's result-filter.pl - ((++c)); rm -rf implicit-common3; - ((++c)); rm -rf order_file-ans; - - # TODO no idea what goes wrong here - ((++c)); rm -rf dwarf-debug-notes; - - einfo "Deleted $c tests that were bound to fail" - - cd "${S}" - ebegin "cleaning Makefiles from unwanted CFLAGS" - find . -name "Makefile" -print0 | xargs -0 sed \ - -i \ - -e 's/ -g / /g' \ - -e 's/^OFLAG =.*$/OFLAG =/' \ - -e 's/install -c -s/install/g' - eend $? - - # -pg is used and the two are incompatible - filter-flags -fomit-frame-pointer -} - -compile_ld64() { - cd "${S}"/${LD64}/src - # remove antiquated copy that's available on any OSX system and - # breaks ld64 compilation - mv include/mach-o/dyld.h{,.disable} - # LTO does not exist on older Macs - if [[ ${CHOST##-darwin} -ge 10 ]] ; then - append-libs LTO - append-flags -DLTO_SUPPORT - else - append-flags -ULTO_SUPPORT - fi - emake \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS} ${LIBS}" \ - || die "emake failed for ld64" - use test && emake build_test - # restore, it's necessary for cctools' install - mv include/mach-o/dyld.h{.disable,} -} - -compile_cctools() { - cd "${S}"/${CCTOOLS} - emake \ - LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \ - EFITOOLS= \ - COMMON_SUBDIRS='libstuff ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - || die "emake failed for the cctools" - cd "${S}"/${CCTOOLS}/as - emake \ - BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - || die "emake failed for as" -} - -src_compile() { - tc-export CC CXX AR - compile_ld64 - compile_cctools -} - -install_ld64() { - exeinto ${BINPATH} - doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump} - dosym ld64 ${BINPATH}/ld - insinto ${DATAPATH}/man/man1 - doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1 -} - -install_cctools() { - cd "${S}"/${CCTOOLS} - emake install_all_but_headers \ - EFITOOLS= \ - COMMON_SUBDIRS='ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - DSTROOT=\"${D}\" \ - BINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCBINDIR=\"${EPREFIX}\"${BINPATH} \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \ - MANDIR=\"${EPREFIX}\"${DATAPATH}/man/ - cd "${S}"/${CCTOOLS}/as - emake install \ - BUILD_OBSOLETE_ARCH= \ - DSTROOT=\"${D}\" \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LIBDIR=\"${EPREFIX}\"${LIBPATH} - - cd "${ED}"${BINPATH} - insinto ${DATAPATH}/man/man1 - local skips manpage - # ar brings an up-to-date manpage with it - skips=( ar ) - for bin in *; do - for skip in ${skips[@]}; do - if [[ ${bin} == ${skip} ]]; then - continue 2; - fi - done - manpage=${S}/${CCTOOLS}/man/${bin}.1 - if [[ -f "${manpage}" ]]; then - doins "${manpage}" - fi - done - insinto ${DATAPATH}/man/man5 - doins "${S}"/${CCTOOLS}/man/*.5 -} - -src_test() { - einfo "Running unit tests" - cd "${S}"/${LD64}/unit-tests/test-cases - # need host arch, since GNU arch doesn't do what Apple's does - tc-export CC CXX - perl ../bin/make-recursive.pl \ - ARCH="$(/usr/bin/arch)" \ - RELEASEDIR="${S}"/${LD64}/src \ - | perl ../bin/result-filter.pl -} - -src_install() { - install_ld64 - install_cctools - - cd "${S}" - insinto /etc/env.d/binutils - cat <<-EOF > env.d - TARGET="${CHOST}" - VER="${PV}" - FAKE_TARGETS="${CHOST}" - EOF - newins env.d ${CHOST}-${PV} -} - -pkg_postinst() { - binutils-config ${CHOST}-${PV} -} diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild deleted file mode 100644 index b8b2ed567062..000000000000 --- a/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild,v 1.1 2010/11/18 19:37:05 grobian Exp $ - -EAPI="3" - -inherit eutils flag-o-matic toolchain-funcs - -RESTRICT="test" # the test suite will test what's installed. - -LD64=ld64-97.14 -CCTOOLS=cctools-782 -# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html -UNWIND=binutils-apple-3.2-unwind-patches-5 - -DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.3" -HOMEPAGE="http://www.opensource.apple.com/darwinsource/" -SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz - http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz - http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz" - -LICENSE="APSL-2" -KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" -IUSE="lto test" -SLOT="0" - -RDEPEND="sys-devel/binutils-config - lto? ( sys-devel/llvm ) - test? ( >=dev-lang/perl-5.8.8 )" -DEPEND="${RDEPEND} - >=sys-devel/gcc-apple-4.2.1" - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } - -if is_cross ; then - SLOT="${CTARGET}" -else - SLOT="0" -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 - -S=${WORKDIR} - -src_prepare() { - cd "${S}"/${CCTOOLS} - epatch "${FILESDIR}"/${PN}-3.2.2-as.patch - epatch "${FILESDIR}"/${PN}-3.2.3-as-dir.patch - epatch "${FILESDIR}"/${PN}-3.2.3-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch - - cd "${S}"/${LD64}/src - cp "${FILESDIR}"/ld64-95.2.12-Makefile Makefile - - ln -s ../../${CCTOOLS}/include - cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/ - cp other/prune_trie.h include/mach-o/ || die - # use our own copy of lto.h, which doesn't require llvm build-env - mkdir -p include/llvm-c || die - cp "${WORKDIR}"/ld64-unwind/${LD64}-llvm-lto.h include/llvm-c/lto.h || die - - echo '' > configure.h - echo '' > linker_opts - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" - echo "char ldVersionString[] = ${VER_STR};" > version.cpp - - epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch - [[ ${CHOST} == powerpc*-darwin* ]] && \ - epatch "${FILESDIR}"/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch - if use !lto ; then - sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die - fi - - # clean up test suite - cd "${S}"/${LD64} - epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch - - cd "${S}"/${LD64}/unit-tests/test-cases - local c - - # we don't have llvm - ((++c)); rm -rf llvm-integration; - - # we don't have dtrace - ((++c)); rm -rf dtrace-static-probes-coalescing; - ((++c)); rm -rf dtrace-static-probes; - - # a file is missing - ((++c)); rm -rf eh-coalescing-r - - # we don't do universal binaries - ((++c)); rm -rf blank-stubs; - - # looks like a problem with apple's result-filter.pl - ((++c)); rm -rf implicit-common3; - ((++c)); rm -rf order_file-ans; - - # TODO no idea what goes wrong here - ((++c)); rm -rf dwarf-debug-notes; - - einfo "Deleted $c tests that were bound to fail" - - cd "${S}" - ebegin "cleaning Makefiles from unwanted CFLAGS" - find . -name "Makefile" -print0 | xargs -0 sed \ - -i \ - -e 's/ -g / /g' \ - -e 's/^OFLAG =.*$/OFLAG =/' \ - -e 's/install -c -s/install/g' - eend $? - - # -pg is used and the two are incompatible - filter-flags -fomit-frame-pointer -} - -src_configure() { - tc-export CC CXX AR - if use lto ; then - append-flags -DLTO_SUPPORT - append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/llvm - append-libs LTO - else - append-flags -ULTO_SUPPORT - fi -} - -compile_ld64() { - cd "${S}"/${LD64}/src - # remove antiquated copy that's available on any OSX system and - # breaks ld64 compilation - mv include/mach-o/dyld.h{,.disable} - emake \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS} ${LIBS}" \ - || die "emake failed for ld64" - use test && emake build_test - # restore, it's necessary for cctools' install - mv include/mach-o/dyld.h{.disable,} -} - -compile_cctools() { - cd "${S}"/${CCTOOLS} - emake \ - LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \ - EFITOOLS= LTO= \ - COMMON_SUBDIRS='libstuff ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - || die "emake failed for the cctools" - cd "${S}"/${CCTOOLS}/as - emake \ - BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - || die "emake failed for as" -} - -src_compile() { - compile_ld64 - compile_cctools -} - -install_ld64() { - exeinto ${BINPATH} - doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump} - dosym ld64 ${BINPATH}/ld - insinto ${DATAPATH}/man/man1 - doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1 -} - -install_cctools() { - cd "${S}"/${CCTOOLS} - emake install_all_but_headers \ - EFITOOLS= LTO= \ - COMMON_SUBDIRS='ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - DSTROOT=\"${D}\" \ - BINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCBINDIR=\"${EPREFIX}\"${BINPATH} \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \ - MANDIR=\"${EPREFIX}\"${DATAPATH}/man/ - cd "${S}"/${CCTOOLS}/as - emake install \ - BUILD_OBSOLETE_ARCH= \ - DSTROOT=\"${D}\" \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LIBDIR=\"${EPREFIX}\"${LIBPATH} - - cd "${ED}"${BINPATH} - insinto ${DATAPATH}/man/man1 - local skips manpage - # ar brings an up-to-date manpage with it - skips=( ar ) - for bin in *; do - for skip in ${skips[@]}; do - if [[ ${bin} == ${skip} ]]; then - continue 2; - fi - done - manpage=${S}/${CCTOOLS}/man/${bin}.1 - if [[ -f "${manpage}" ]]; then - doins "${manpage}" - fi - done - insinto ${DATAPATH}/man/man5 - doins "${S}"/${CCTOOLS}/man/*.5 -} - -src_test() { - einfo "Running unit tests" - cd "${S}"/${LD64}/unit-tests/test-cases - # need host arch, since GNU arch doesn't do what Apple's does - tc-export CC CXX - perl ../bin/make-recursive.pl \ - ARCH="$(/usr/bin/arch)" \ - RELEASEDIR="${S}"/${LD64}/src \ - | perl ../bin/result-filter.pl -} - -src_install() { - install_ld64 - install_cctools - - cd "${S}" - insinto /etc/env.d/binutils - cat <<-EOF > env.d - TARGET="${CHOST}" - VER="${PV}" - FAKE_TARGETS="${CHOST}" - EOF - newins env.d ${CHOST}-${PV} -} - -pkg_postinst() { - binutils-config ${CHOST}-${PV} -} diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild deleted file mode 100644 index dce382dbe163..000000000000 --- a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.ebuild,v 1.6 2010/03/21 19:33:06 grobian Exp $ - -EAPI="3" - -inherit eutils flag-o-matic toolchain-funcs - -RESTRICT="test" # the test suite will test what's installed. - -# LD64=ld64-95.2.12 # can't compile this one, missing libunwind/* includes -# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html -LD64=ld64-85.2.1 # from 3.1.2 -CCTOOLS=cctools-750 -LP64PATCHES=binutils-apple-LP64-patches-1 - -DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2" -HOMEPAGE="http://www.opensource.apple.com/darwinsource/" -SRC_URI="http://www.gentoo.org/~grobian/distfiles/${LD64}.tar.gz - http://www.gentoo.org/~grobian/distfiles/${CCTOOLS}.tar.gz - http://www.gentoo.org/~grobian/distfiles/${LP64PATCHES}.tar.bz2" - -LICENSE="APSL-2" -KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" -IUSE="test" -SLOT="0" - -DEPEND="sys-devel/binutils-config - test? ( >=dev-lang/perl-5.8.8 )" -RDEPEND="${DEPEND}" - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } - -if is_cross ; then - SLOT="${CTARGET}" -else - SLOT="0" -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 - -S=${WORKDIR} - -prepare_ld64() { - cd "${S}"/${LD64}/src - cp "${FILESDIR}"/Makefile . - - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" - sed -i \ - -e '/^#define LTO_SUPPORT 1/s:1:0:' \ - ObjectDump.cpp || die - echo '#undef LTO_SUPPORT' > configure.h - echo '' > linker_opts - echo "char ldVersionString[] = ${VER_STR};" > version.cpp - - # clean up test suite - cd "${S}"/${LD64}/unit-tests/test-cases - local c - - # we don't have llvm - ((++c)); rm -rf llvm-integration; - - # we don't have dtrace - ((++c)); rm -rf dtrace-static-probes-coalescing; - ((++c)); rm -rf dtrace-static-probes; - - # a file is missing - ((++c)); rm -rf eh-coalescing-r - - # we don't do universal binaries - ((++c)); rm -rf blank-stubs; - - # looks like a problem with apple's result-filter.pl - ((++c)); rm -rf implicit-common3; - ((++c)); rm -rf order_file-ans; - - # TODO no idea what goes wrong here - ((++c)); rm -rf dwarf-debug-notes; - - elog "Deleted $c tests that were bound to fail" -} - -src_prepare() { - prepare_ld64 - - cd "${S}"/${CCTOOLS} - epatch "${FILESDIR}"/${PN}-3.1.1-as.patch - epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch - epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch - epatch "${FILESDIR}"/${P}-armv7-defines.patch - - cd "${S}"/${LD64} - epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch - epatch "${WORKDIR}"/LP64/ld64/*.patch - - cd "${S}" - ebegin "cleaning Makefiles from unwanted CFLAGS" - find . -name "Makefile" -print0 | xargs -0 sed \ - -i \ - -e 's/ -g / /g' \ - -e 's/^OFLAG =.*$/OFLAG =/' \ - -e 's/install -c -s/install/g' - eend $? - - # -pg is used and the two are incompatible - filter-flags -fomit-frame-pointer -} - -compile_ld64() { - cd "${S}"/${LD64}/src - # 'struct linkedit_data_command' is defined in mach-o/loader.h on leopard, - # but not on tiger. - [[ ${CHOST} == *-apple-darwin8 ]] && \ - append-flags -isystem "${S}"/${CCTOOLS}/include/ - emake || die "emake failed for ld64" - use test && emake build_test -} - -compile_cctools() { - cd "${S}"/${CCTOOLS} - emake \ - LTO= \ - TRIE= \ - EFITOOLS= \ - COMMON_SUBDIRS='libstuff ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - || die "emake failed for the cctools" - cd "${S}"/${CCTOOLS}/as - emake \ - BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - || die "emake failed for as" -} - -src_compile() { - tc-export CC CXX - compile_cctools - compile_ld64 -} - -install_ld64() { - exeinto ${BINPATH} - doexe "${S}"/${LD64}/src/{ld64,rebase} - dosym ld64 ${BINPATH}/ld - insinto ${DATAPATH}/man/man1 - doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1 -} - -install_cctools() { - cd "${S}"/${CCTOOLS} - emake install_all_but_headers \ - EFITOOLS= \ - COMMON_SUBDIRS='ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - DSTROOT=\"${D}\" \ - BINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCBINDIR=\"${EPREFIX}\"${BINPATH} \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \ - MANDIR=\"${EPREFIX}\"${DATAPATH}/man/ - cd "${S}"/${CCTOOLS}/as - emake install \ - BUILD_OBSOLETE_ARCH= \ - DSTROOT=\"${D}\" \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LIBDIR=\"${EPREFIX}\"${LIBPATH} - - cd "${ED}"${BINPATH} - insinto ${DATAPATH}/man/man1 - local skips manpage - # ar brings an up-to-date manpage with it - skips=( ar ) - for bin in *; do - for skip in ${skips[@]}; do - if [[ ${bin} == ${skip} ]]; then - continue 2; - fi - done - manpage=${S}/${CCTOOLS}/man/${bin}.1 - if [[ -f "${manpage}" ]]; then - doins "${manpage}" - fi - done - insinto ${DATAPATH}/man/man5 - doins "${S}"/${CCTOOLS}/man/*.5 -} - -src_test() { - einfo "Running unit tests" - cd "${S}"/${LD64}/unit-tests/test-cases - # need host arch, since GNU arch doesn't do what Apple's does - tc-export CC CXX - perl ../bin/make-recursive.pl \ - ARCH="$(/usr/bin/arch)" \ - RELEASEDIR="${S}"/${LD64}/src \ - | perl ../bin/result-filter.pl -} - -src_install() { - install_ld64 - install_cctools - - cd "${S}" - insinto /etc/env.d/binutils - cat <<-EOF > env.d - TARGET="${CHOST}" - VER="${PV}" - FAKE_TARGETS="${CHOST}" - EOF - newins env.d ${CHOST}-${PV} -} - -pkg_postinst() { - binutils-config ${CHOST}-${PV} -} diff --git a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.1.ebuild deleted file mode 100644 index 3809d3ef0420..000000000000 --- a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild +++ /dev/null @@ -1,289 +0,0 @@ -# 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.6 2011/11/05 16:37:23 grobian Exp $ - -EAPI="3" - -inherit eutils flag-o-matic toolchain-funcs - -RESTRICT="test" # the test suite will test what's installed. - -LD64=ld64-123.2.1 -CCTOOLS=cctools-806 -LIBUNWIND=libunwind-30 -DYLD=dyld-195.5 -# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html -UNWIND=binutils-apple-3.2-unwind-patches-5 - -DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}" -HOMEPAGE="http://www.opensource.apple.com/darwinsource/" -SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz - http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz - http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz - http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz - http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz - http://www.gentoo.org/~grobian/distfiles/libunwind-llvm-115426.tar.bz2" - -LICENSE="APSL-2" -KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" -IUSE="lto test" - -RDEPEND="sys-devel/binutils-config - lto? ( sys-devel/llvm ) - test? ( >=dev-lang/perl-5.8.8 )" -DEPEND="${RDEPEND} - >=sys-devel/gcc-apple-4.2.1" - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } - -if is_cross ; then - SLOT="${CTARGET}-4" -else - SLOT="4" -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 - -S=${WORKDIR} - -src_prepare() { - cd "${S}"/${LIBUNWIND}/src - cp "${FILESDIR}"/${LIBUNWIND}-Makefile Makefile - - cd "${S}"/${LD64}/src - cp "${FILESDIR}"/${LD64%.1}-Makefile Makefile - epatch "${FILESDIR}"/${LD64}-lto.patch - - ln -s ../../${CCTOOLS}/include - cp other/prune_trie.h include/mach-o/ || die - # use our own copy of lto.h, which doesn't require llvm build-env - 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 - 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 - { - 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 - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" - echo "char ldVersionString[] = ${VER_STR};" > version.cpp - - epatch "${FILESDIR}"/${LD64%.1}-debug-backtrace.patch - if [[ ${CHOST} == powerpc*-darwin* ]] ; then - epatch "${FILESDIR}"/${LD64%.1}-darwin8-no-mlong-branch-warning.patch - sed -i -e '/#include <mach-o\/loader.h>/a\#include <mach/i386/thread_status.h>' \ - ld/HeaderAndLoadCommands.hpp || die - fi - if use !lto ; then - sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die - fi - - cd "${S}"/${CCTOOLS} - epatch "${FILESDIR}"/${PN}-4.0-as.patch - epatch "${FILESDIR}"/${PN}-4.0-as-dir.patch - epatch "${FILESDIR}"/${PN}-3.2.3-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch - epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch - epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch - epatch "${FILESDIR}"/${PN}-4.0-no-oss-dir.patch - - # clean up test suite - cd "${S}"/${LD64} -# epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch - - cd "${S}"/${LD64}/unit-tests/test-cases - local c - - # we don't have llvm - ((++c)); rm -rf llvm-integration; - - # we don't have dtrace - ((++c)); rm -rf dtrace-static-probes-coalescing; - ((++c)); rm -rf dtrace-static-probes; - - # a file is missing - ((++c)); rm -rf eh-coalescing-r - - # we don't do universal binaries - ((++c)); rm -rf blank-stubs; - - # looks like a problem with apple's result-filter.pl - ((++c)); rm -rf implicit-common3; - ((++c)); rm -rf order_file-ans; - - # TODO no idea what goes wrong here - ((++c)); rm -rf dwarf-debug-notes; - - einfo "Deleted $c tests that were bound to fail" - - cd "${S}" - ebegin "cleaning Makefiles from unwanted CFLAGS" - find . -name "Makefile" -print0 | xargs -0 sed \ - -i \ - -e 's/ -g / /g' \ - -e 's/^OFLAG =.*$/OFLAG =/' \ - -e 's/install -c -s/install/g' - eend $? - - # -pg is used and the two are incompatible - filter-flags -fomit-frame-pointer -} - -src_configure() { - tc-export CC CXX AR - if use lto ; then - append-flags -DLTO_SUPPORT - append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/llvm - append-libs LTO - LTO=1 - else - append-flags -ULTO_SUPPORT - LTO=0 - fi - append-flags -DNDEBUG - append-flags -I${WORKDIR}/libunwind/include -} - -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 -} - -compile_ld64() { - einfo "building ${LD64}" - cd "${S}"/${LD64}/src - # remove antiquated copy that's available on any OSX system and - # breaks ld64 compilation - mv include/mach-o/dyld.h{,.disable} - emake \ - LTO=${LTO} \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS} -I../../${DYLD}/include" \ - LDFLAGS="${LDFLAGS} ${LIBS}" \ - || die "emake failed for ld64" - use test && emake build_test - # restore, it's necessary for cctools' install - mv include/mach-o/dyld.h{.disable,} -} - -compile_cctools() { - einfo "building ${CCTOOLS}" - cd "${S}"/${CCTOOLS} - emake \ - LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \ - EFITOOLS= LTO= \ - COMMON_SUBDIRS='libstuff ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - || die "emake failed for the cctools" - cd "${S}"/${CCTOOLS}/as - emake \ - BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - || die "emake failed for as" -} - -src_compile() { - compile_ld64 - compile_cctools -} - -install_ld64() { - exeinto ${BINPATH} - doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump} - dosym ld64 ${BINPATH}/ld - insinto ${DATAPATH}/man/man1 - doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1 -} - -install_cctools() { - cd "${S}"/${CCTOOLS} - emake install_all_but_headers \ - EFITOOLS= LTO= \ - COMMON_SUBDIRS='ar misc otool' \ - SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - DSTROOT=\"${D}\" \ - BINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCBINDIR=\"${EPREFIX}\"${BINPATH} \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \ - MANDIR=\"${EPREFIX}\"${DATAPATH}/man/ - cd "${S}"/${CCTOOLS}/as - emake install \ - BUILD_OBSOLETE_ARCH= \ - DSTROOT=\"${D}\" \ - USRBINDIR=\"${EPREFIX}\"${BINPATH} \ - LIBDIR=\"${EPREFIX}\"${LIBPATH} \ - LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} - - cd "${ED}"${BINPATH} - insinto ${DATAPATH}/man/man1 - local skips manpage - # ar brings an up-to-date manpage with it - skips=( ar ) - for bin in *; do - for skip in ${skips[@]}; do - if [[ ${bin} == ${skip} ]]; then - continue 2; - fi - done - manpage=${S}/${CCTOOLS}/man/${bin}.1 - if [[ -f "${manpage}" ]]; then - doins "${manpage}" - fi - done - insinto ${DATAPATH}/man/man5 - doins "${S}"/${CCTOOLS}/man/*.5 -} - -src_test() { - einfo "Running unit tests" - cd "${S}"/${LD64}/unit-tests/test-cases - # need host arch, since GNU arch doesn't do what Apple's does - tc-export CC CXX - perl ../bin/make-recursive.pl \ - ARCH="$(/usr/bin/arch)" \ - RELEASEDIR="${S}"/${LD64}/src \ - | perl ../bin/result-filter.pl -} - -src_install() { - install_ld64 - install_cctools - - cd "${S}" - insinto /etc/env.d/binutils - cat <<-EOF > env.d - TARGET="${CHOST}" - VER="${PV}" - FAKE_TARGETS="${CHOST}" - EOF - newins env.d ${CHOST}-${PV} -} - -pkg_postinst() { - binutils-config ${CHOST}-${PV} -} diff --git a/sys-devel/binutils-apple/files/binutils-apple-3.2-armv7-defines.patch b/sys-devel/binutils-apple/files/binutils-apple-3.2-armv7-defines.patch deleted file mode 100644 index d89a0c19f2c6..000000000000 --- a/sys-devel/binutils-apple/files/binutils-apple-3.2-armv7-defines.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cctools/include/mach/machine.h -+++ cctools/include/mach/machine.h -@@ -306,6 +306,7 @@ - #define CPU_SUBTYPE_ARM_V6 ((cpu_subtype_t) 6) - #define CPU_SUBTYPE_ARM_V5TEJ ((cpu_subtype_t) 7) - #define CPU_SUBTYPE_ARM_XSCALE ((cpu_subtype_t) 8) -+#define CPU_SUBTYPE_ARM_V7 ((cpu_subtype_t) 9) - - /* - * MC88000 subtypes diff --git a/sys-devel/binutils-apple/files/binutils-apple-3.2-ld64-Makefile b/sys-devel/binutils-apple/files/binutils-apple-3.2-ld64-Makefile deleted file mode 100644 index 976299a1d430..000000000000 --- a/sys-devel/binutils-apple/files/binutils-apple-3.2-ld64-Makefile +++ /dev/null @@ -1,29 +0,0 @@ -AR = ar -CXX = g++ -INCS = -Iinclude -Isrc/abstraction -Isrc/ld -CXXFLAGS = $(INCS) -LDFLAGS = - -all: machocheck rebase unwinddump dyldinfo ObjectDump ld - -libprunetrie.a: src/other/PruneTrie.o src/other/prune_trie.h - $(AR) -r -c libprunetrie.a src/other/PruneTrie.o - -ld: libprunetrie.a src/ld/ld.o src/ld/Options.o src/ld/debugline.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ - -rebase: src/other/rebase.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ - -dyldinfo: src/other/dyldinfo.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ - -unwinddump: src/other/unwinddump.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ - -ObjectDump: src/other/ObjectDump.o src/ld/debugline.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ - -machocheck: src/other/machochecker.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ - diff --git a/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch b/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch deleted file mode 100644 index a13ace81b550..000000000000 --- a/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch +++ /dev/null @@ -1,69 +0,0 @@ -handles the libexecdir for as and other fixes - ---- cctools-698/as/driver.c -+++ cctools-698/as/driver.c -@@ -27,6 +27,9 @@ - char **envp) - { - const char *LIB = -+#ifdef ASLIBEXECDIR -+ ASLIBEXECDIR; -+#else - #if defined(__OPENSTEP__) || defined(__HERA__) || \ - defined(__GONZO_BUNSEN_BEAKER__) || defined(__KODIAK__) - "/usr/libexec/"; -@@ -40,6 +42,7 @@ - #else - "/usr/local/libexec/gcc/darwin/"; - #endif -+#endif - const char *AS = "/as"; - - int i; -@@ -170,7 +170,11 @@ - } - - } -+#ifndef ASLIBEXECDIR - as = makestr(prefix, LIB, arch_name, AS, NULL); -+#else -+ as = makestr(LIB, arch_name, AS, NULL); -+#endif - - /* - * If this assembler exist try to run it else print an error message. -@@ -182,6 +182,10 @@ - else - exit(1); - } -+#ifdef ASLIBEXECDIR -+ as_local = ""; -+ { -+#else - as_local = makestr(prefix, LOCALLIB, arch_name, AS, NULL); - if(access(as_local, F_OK) == 0){ - argv[0] = as_local; -@@ -193,6 +198,7 @@ - exit(1); - } - else{ -+#endif - printf("%s: assembler (%s or %s) for architecture %s not " - "installed\n", progname, as, as_local, arch_name); - arch_flags = get_arch_flags(); -@@ -183,6 +190,7 @@ - printf("%s for architecture %s\n", as, arch_flags[i].name); - count++; - } -+#ifndef ASLIBEXECDIR - else{ - as_local = makestr(LOCALLIB, arch_flags[i].name, AS, NULL); - if(access(as_local, F_OK) == 0){ -@@ -193,6 +201,7 @@ - count++; - } - } -+#endif - } - if(count == 0) - printf("%s: no assemblers installed\n", progname); |