Revbump for added support for LTO via USE=lto. This requires LLVM to be installed for the LTO library.

Package-Manager: portage-2.2.01.17168-prefix/cvs/Darwin powerpc

4 files changed, 269 insertions, 4 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 8f4352636914..a08512fb11ef 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2010/08/16 07:39:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.16 2010/11/18 19:37:05 grobian Exp $
+
+*binutils-apple-3.2.3-r2 (18 Nov 2010)
+
+  18 Nov 2010; Fabian Groffen <grobian@gentoo.org>
+  +binutils-apple-3.2.3-r2.ebuild, metadata.xml:
+  Revbump for added support for LTO via USE=lto. This requires LLVM to be
+  installed for the LTO library.
 
   16 Aug 2010; Fabian Groffen <grobian@gentoo.org>
   binutils-apple-3.2.3-r1.ebuild:
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 0bb0acceb94d..bb5ef99e2f0f 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -35,6 +35,7 @@ EBUILD binutils-apple-3.1.2.ebuild 5288 RMD160 bbe9a2371e5e1e66b0c9fa2f4ca600bb2
 EBUILD binutils-apple-3.2-r1.ebuild 6228 RMD160 fdd810e43d987bebc9c938beb12ac204667f0cbe SHA1 489c9b0f50541e29f6dc60de68aa3ee21c1c538b SHA256 26c29b4bf9584053e42a6a3d197afc0a21f95413bf6bccf86cb21f4e08c3bcaa
 EBUILD binutils-apple-3.2.2.ebuild 6202 RMD160 73621094f924415c7669361fde13cc9911ccd56c SHA1 fade93e2da454f2c1f5f9166fbdfbd186efee932 SHA256 c26d98fd40daf363671147acfa554992310b3cda657242a880f2c026f05dac5f
 EBUILD binutils-apple-3.2.3-r1.ebuild 6521 RMD160 6bd22707129894fc03f8949c79c1b02adb471680 SHA1 f1b1ef2114135646591c0d566bc0b69063f5e8c3 SHA256 bf10cfbacb2e16227ffba16e0509df7ed678aba1aebedee621ac12b6d5491ddb
+EBUILD binutils-apple-3.2.3-r2.ebuild 6669 RMD160 8a32c0be4ec8a6e8c89f5c2155fb172ebc4565e4 SHA1 9c495edc134edf36478897a7950510e7b57f92fe SHA256 17b6d484e33a20939d00a6bf496fe6aefa2920d21c4fbb6bbf359e853f754f7f
 EBUILD binutils-apple-3.2.ebuild 5913 RMD160 47df8d8d2e207eb95e10359f35c2c5fd152f8938 SHA1 26b56881f56b63bc3f9b25aeae6c814f969f5dfd SHA256 41fb357219cdbb20f16200d05016c1866046f9a351994b738d6e0b7176f3488e
-MISC ChangeLog 6610 RMD160 7cd0f4b934d2dd6c2bc8fa64fb94d1acfb59200e SHA1 d3f7ce24b78e82455ff467526c41b6a9d7b336a3 SHA256 9a53e393265b264a6b3a1317e48bdf4df8acfcbacbd43ace28e304f2a3dbfe55
-MISC metadata.xml 159 RMD160 daf7422c2bde2c03abbeccce93691898dee7460a SHA1 dac0288d1bc404d23c4d31e83c51d9f9381a2828 SHA256 9f4e165acd1a7bdc5c8ccdb4a40a2e969e056b8463bfe94a1b2e29cc4ef62af4
+MISC ChangeLog 6858 RMD160 90aecb33d2e1ee163fe638aabbbdc076f6724c3d SHA1 c22c55d3a6da6b6569ba04d8067eb85324f5b118 SHA256 113ea08df295f50c5387244fa8e33ca1e2680948c418c4102673f21008e97f46
+MISC metadata.xml 250 RMD160 1d572689c02f6408ad8dfcfc955f8dfb7ec3a201 SHA1 dbd7759df5303c9dd998023753a3361206bad1e2 SHA256 f783a2767bd8eb2edebc0b1b1391fdcb461dcdb7a7c99dc1b82504c466688e79
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
new file mode 100644
index 000000000000..b8b2ed567062
--- /dev/null
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild
@@ -0,0 +1,254 @@
+# 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/metadata.xml b/sys-devel/binutils-apple/metadata.xml
index 46dee96f4e7a..b5dd68e07eff 100644
--- a/sys-devel/binutils-apple/metadata.xml
+++ b/sys-devel/binutils-apple/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>prefix</herd>
+	<herd>prefix</herd>
+	<use>
+		<flag name="lto">Add support for Link-Time Optimization with LLVM</flag>
+	</use>
 </pkgmetadata>