Bump to version from Developer Tools 4.3

Package-Manager: portage-2.2.01.20271-prefix/cvs/Darwin i386

5 files changed, 447 insertions, 3 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 52a1a6175ff3..1daec44af998 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2012/03/04 15:44:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.30 2012/03/04 16:16:19 grobian Exp $
+
+*binutils-apple-4.3 (04 Mar 2012)
+
+  04 Mar 2012; Fabian Groffen <grobian@gentoo.org> +binutils-apple-4.3.ebuild,
+  +files/ld64-128.2-Makefile:
+  Bump to version from Developer Tools 4.3
 
   04 Mar 2012; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.2.ebuild:
   Avoid the need for vers_string program that seems no longer to be installed
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3.ebuild
new file mode 100644
index 000000000000..537f435c663f
--- /dev/null
+++ b/sys-devel/binutils-apple/binutils-apple-4.3.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2012 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.3.ebuild,v 1.1 2012/03/04 16:16:19 grobian Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+RESTRICT="test" # the test suite will test what's installed.
+
+LD64=ld64-128.2
+CCTOOLS=cctools-822
+LIBUNWIND=libunwind-30
+DYLD=dyld-195.6
+# 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-128.2-Makefile Makefile
+	epatch "${FILESDIR}"/ld64-127.2-lto.patch
+	epatch "${FILESDIR}"/ld64-127.2-ppc-range-warning.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-123.2-debug-backtrace.patch
+	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
+		epatch "${FILESDIR}"/ld64-123.2-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.2-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
+	epatch "${FILESDIR}"/${PN}-4.2-lto.patch
+
+	local program
+	for program in ar efitools gprof libmacho misc otool ; do
+		VER_STR="@(#)PROGRAM:${program}  PROJECT:${CCTOOLS} (Gentoo ${PN}-${PVR}) DEVELOPER:${PORTAGE_ROOT_USER}  BUILT:$(date)"
+		cat > ${program}/vers.c <<- _EOF
+			#include <sys/cdefs.h>
+			__IDSTRING(SGS_VERS,"${VER_STR}\n");
+		_EOF
+		[[ ${program} != "libmacho" ]] && \
+			echo '__IDSTRING(VERS_NUM,"apple");' >> ${program}/vers.c
+	done
+
+	VER_STR="${CCTOOLS} (Gentoo ${PN}-${PVR})"
+	echo "const char apple_version[] = \"${VER_STR}\";" \
+		>> as/apple_version.c || die
+	echo "const char apple_version[] = \"${VER_STR})\";" \
+		>> efitools/vers.c || die
+	echo "const char apple_version[] = \"${VER_STR})\";" \
+		>> ld/ld_vers.c || die
+	echo "const char apple_version[] = \"${VER_STR})\";" \
+		>> misc/vers.c || 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
+}
+
+src_configure() {
+	tc-export CC CXX AR
+	if use lto ; then
+		append-cppflags -DLTO_SUPPORT
+		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/llvm
+		append-libs LTO
+		LTO=1
+	else
+		append-cppflags -ULTO_SUPPORT
+		LTO=0
+	fi
+	append-cppflags -DNDEBUG
+	append-cppflags -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/ld64-128.2-Makefile b/sys-devel/binutils-apple/files/ld64-128.2-Makefile
new file mode 100644
index 000000000000..b02c82459449
--- /dev/null
+++ b/sys-devel/binutils-apple/files/ld64-128.2-Makefile
@@ -0,0 +1,47 @@
+CPPFLAGS += "-DCPU_SUBTYPE_X86_ALL=((cpu_subtype_t)3)" -Iinclude -Iabstraction -Ild -Ild/parsers -Iother -I.
+
+# dropped machocheck due to compilation failures
+all: rebase unwinddump dyldinfo ld64 ObjectDump
+
+libprunetrie.a: other/PruneTrie.o other/prune_trie.h
+	$(AR) -s -r -c libprunetrie.a other/PruneTrie.o
+
+LD64LIBS=ld/parsers/archive_file.o ld/parsers/macho_relocatable_file.o \
+		 ld/parsers/opaque_section_file.o \
+		 ld/parsers/macho_dylib_file.o \
+		 ld/passes/branch_island.o ld/passes/dylibs.o ld/passes/order.o \
+		 ld/passes/branch_shim.o ld/passes/got.o ld/passes/tlvp.o \
+		 ld/passes/compact_unwind.o ld/passes/huge.o \
+		 ld/passes/dtrace_dof.o ld/passes/objc.o \
+		 ld/passes/stubs/stubs.o \
+		 ld/InputFiles.o ld/OutputFile.o ld/SymbolTable.o \
+		 ld/Options.o ld/Resolver.o ld/debugline.o ld/ld.o
+
+ifeq ($(LTO),1)
+CPPFLAGS += "-DLTO"
+LTO_OBJ = ld/parsers/lto_file.o
+LIBLTO = -lLTO
+else
+CPPFLAGS += "-ULTO"
+LTO_OBJ =
+LIBLTO =
+endif
+
+ld64: libprunetrie.a version.o $(LD64LIBS) $(LTO_OBJ)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^
+
+rebase: other/rebase.o
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
+
+dyldinfo: other/dyldinfo.o
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
+
+unwinddump: other/unwinddump.o
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
+
+ObjectDump: other/ObjectDump.o ld/debugline.o ld/parsers/macho_relocatable_file.o $(LTO_OBJ)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^
+
+machocheck: other/machochecker.o
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
+
diff --git a/sys-devel/gdb-apple/ChangeLog b/sys-devel/gdb-apple/ChangeLog
index 1c54f0c96c73..c5f32c55d214 100644
--- a/sys-devel/gdb-apple/ChangeLog
+++ b/sys-devel/gdb-apple/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gdb-apple
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/ChangeLog,v 1.17 2011/11/05 16:50:13 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/ChangeLog,v 1.18 2012/03/04 16:15:04 grobian Exp $
+
+*gdb-apple-1752 (04 Mar 2012)
+
+  04 Mar 2012; Fabian Groffen <grobian@gentoo.org> +gdb-apple-1752.ebuild:
+  Bump to version from Developer Tools 4.3
 
 *gdb-apple-1708 (05 Nov 2011)
 
diff --git a/sys-devel/gdb-apple/gdb-apple-1752.ebuild b/sys-devel/gdb-apple/gdb-apple-1752.ebuild
new file mode 100644
index 000000000000..8887416daa00
--- /dev/null
+++ b/sys-devel/gdb-apple/gdb-apple-1752.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/gdb-apple-1752.ebuild,v 1.1 2012/03/04 16:15:04 grobian Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic
+
+APPLE_PV=${PV}
+DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 4.3"
+HOMEPAGE="http://sources.redhat.com/gdb/"
+SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${APPLE_PV}.tar.gz"
+
+LICENSE="APSL-2 GPL-2"
+SLOT="0"
+
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="nls"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2
+	=dev-db/sqlite-3*"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/gdb-${APPLE_PV}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-no-global-gdbinit.patch
+	epatch "${FILESDIR}"/${PN}-768-texinfo.patch
+	epatch "${FILESDIR}"/${PN}-1518-darwin8-9.patch
+	epatch "${FILESDIR}"/${PN}-1705-darwin8-10.patch
+	[[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${PN}-1518-darwin8.patch
+}
+
+src_configure() {
+	replace-flags -O? -O2
+	econf \
+		--disable-werror \
+		--disable-debug-symbols-framework \
+		$(use_enable nls) \
+		|| die
+}
+
+src_compile() {
+	# unable to work around parallel make issue
+	emake -j2 || die
+}
+
+src_install() {
+	emake -j2 DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die
+	rm -R "${D}"/nukeme || die
+	rm -Rf "${ED}"/usr/${CHOST} || die
+	mv "${ED}"/usr/bin/gdb "${ED}"/
+	rm -f "${ED}"/usr/bin/*
+	mv "${ED}"/gdb "${ED}"/usr/bin/
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then
+		ewarn "Due to increased security measures in 10.5 and up, gdb is"
+		ewarn "not able to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+	if use x86-macos || use x64-macos ; then
+		einfo "FSF gdb works on Intel-based OSX platforms, sometimes even"
+		einfo "better than gdb-apple.  You can consider installing FSF gdb"
+		einfo "instead of gdb-apple, since the FSF version is surely more"
+		einfo "advanced than this old 6.8 version modified by Apple."
+	fi
+}