Version bump to version from Develper Tools 3.2.3, thanks to Heiko Przybyl for the patching and LTO support

(Portage version: 2.2.01.15449-prefix/cvs/Darwin powerpc)

5 files changed, 387 insertions, 2 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 1a4e3e417408..a663ee11883f 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/binutils-apple
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.12 2010/05/18 10:42:10 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.13 2010/08/06 20:08:22 grobian Exp $
+
+*binutils-apple-3.2.3 (06 Aug 2010)
+
+  06 Aug 2010; Fabian Groffen <grobian@gentoo.org>
+  +binutils-apple-3.2.3.ebuild, +files/binutils-apple-3.2.3-as-dir.patch,
+  +files/binutils-apple-3.2.3-ranlib.patch:
+  Version bump to version from Develper Tools 3.2.3, thanks to Heiko Przybyl
+  for the patching and LTO support
 
 *binutils-apple-3.2.2 (18 May 2010)
 
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.3.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.3.ebuild
new file mode 100644
index 000000000000..d88c184bea1e
--- /dev/null
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.3.ebuild
@@ -0,0 +1,249 @@
+# 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.ebuild,v 1.1 2010/08/06 20:08:22 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-4
+
+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} == *-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
+	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/files/binutils-apple-3.2.3-as-dir.patch b/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch
new file mode 100644
index 000000000000..a13ace81b550
--- /dev/null
+++ b/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch
@@ -0,0 +1,69 @@
+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);
diff --git a/sys-devel/binutils-apple/files/binutils-apple-3.2.3-ranlib.patch b/sys-devel/binutils-apple/files/binutils-apple-3.2.3-ranlib.patch
new file mode 100644
index 000000000000..e5292746eadf
--- /dev/null
+++ b/sys-devel/binutils-apple/files/binutils-apple-3.2.3-ranlib.patch
@@ -0,0 +1,59 @@
+run ranlib before installation so we needn't touch permissions
+
+--- cctools-782/cbtlibs/Makefile	2009-12-16 20:34:18.000000000 +0100
++++ cctools-782/cbtlibs/Makefile.new	2010-07-30 20:08:22.000000000 +0200
+@@ -84,9 +84,9 @@ libsyminfo.a: libsyminfo.o
+ 
+ lib_ofiles_install: lib_ofiles
+ 	$(MKDIRS) $(DSTROOT)$(LOCLIBDIR)
++	ranlib $(DSTROOT)$(LOCLIBDIR)/libsyminfo.a
+ 	install -p -c -m 444 $(SYMROOT)/libsyminfo.a \
+ 		$(DSTROOT)$(LOCLIBDIR)/libsyminfo.a
+-	ranlib $(DSTROOT)$(LOCLIBDIR)/libsyminfo.a
+ 
+ -include $(OFILE_DIR)/Makedep
+ 
+--- cctools-782/libmacho/Makefile	2010-03-30 00:57:21.000000000 +0200
++++ cctools-782/libmacho/Makefile.new	2010-07-30 20:07:57.000000000 +0200
+@@ -357,17 +357,17 @@ macos_lib_ofiles_install: all
+ 	$(MKDIRS) $(DSTROOT)$(ARCHIVEDIR) $(DSTROOT)$(DYLIBDIR)
+ 	if [ $(SRCROOT) = . ];						\
+ 	then								\
++	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho.a;			\
+ 	    install -c -m 444 dtmp_obj/libmacho.a			\
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho.a;		\
+-	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho.a;			\
+ 	    (cd $(DSTROOT)$(ARCHIVEDIR) ;				\
+ 	    rm -f libmacho_debug.a ; ln -s libmacho.a libmacho_debug.a); \
++	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho_profile.a;		\
+ 	    install -c -m 444 ptmp_obj/libmacho_pg.a			 \
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho_profile.a;	\
+-	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho_profile.a;		\
++	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho_static.a;		\
+ 	    install -c -m 444 otmp_obj/libmacho_static.a		\
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho_static.a;		\
+-	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho_static.a;		\
+ 	    install -c -m 555 dtmp_obj/libmacho.dylib			\
+ 		     $(DSTROOT)$(DYLIBDIR)/libmacho.dylib;		\
+ 	    strip -S $(DSTROOT)$(DYLIBDIR)/libmacho.dylib;		\
+@@ -378,17 +378,17 @@ macos_lib_ofiles_install: all
+ 		     $(DSTROOT)$(DYLIBDIR)/libmacho_debug.dylib;	\
+ 	    strip -S $(DSTROOT)$(DYLIBDIR)/libmacho_debug.dylib;	\
+ 	else								\
++	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho.a;			\
+ 	    install -c -m 444 $(SYMROOT)/libmacho.a			\
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho.a;		\
+-	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho.a;			\
+ 	    (cd $(DSTROOT)$(ARCHIVEDIR) ;				\
+ 	    rm -f libmacho_debug.a ; ln -s libmacho.a libmacho_debug.a); \
++	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho_profile.a;		\
+ 	    install -c -m 444 $(SYMROOT)/libmacho_pg.a			 \
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho_profile.a;	\
+-	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho_profile.a;		\
++	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho_static.a;		\
+ 	    install -c -m 444 $(SYMROOT)/libmacho_static.a		\
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho_static.a;		\
+-	    ranlib $(DSTROOT)$(ARCHIVEDIR)/libmacho_static.a;		\
+ 	    install -c -m 555 $(SYMROOT)/libmacho.dylib			\
+ 		     $(DSTROOT)$(DYLIBDIR)/libmacho.dylib;		\
+ 	    strip -S $(DSTROOT)$(DYLIBDIR)/libmacho.dylib;		\
diff --git a/sys-devel/binutils-apple/metadata.xml b/sys-devel/binutils-apple/metadata.xml
index 925cf70da957..46dee96f4e7a 100644
--- a/sys-devel/binutils-apple/metadata.xml
+++ b/sys-devel/binutils-apple/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>apple</herd>
+<herd>prefix</herd>
 </pkgmetadata>