Bump to version from Snow Leopard/Developer Tools 3.2, still masked as fortran support is broken

Package-Manager: portage-2.2.00.14200-prefix/cvs/SunOS i386

3 files changed, 325 insertions, 2 deletions

diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog
index 2ac21fbe29a6..4d568076b46c 100644
--- a/sys-devel/gcc-apple/ChangeLog
+++ b/sys-devel/gcc-apple/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gcc-apple
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.6 2009/06/28 11:12:10 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.7 2009/09/05 16:46:34 grobian Exp $
+
+*gcc-apple-4.2.1_p5646 (05 Sep 2009)
+
+  05 Sep 2009; Fabian Groffen <grobian@gentoo.org>
+  +gcc-apple-4.2.1_p5646.ebuild:
+  Bump to version from Snow Leopard/Developer Tools 3.2, still masked as
+  fortran support is broken
 
   28 Jun 2009; Fabian Groffen <grobian@gentoo.org>
   +gcc-apple-4.2.1_p5566-x86_64-defines.patch, +libstdc++-16.patch
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 5cc6ed6b8f7f..21348a2c5bb5 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -8,15 +8,18 @@ AUX gcc-apple-4.2.1_p5566-x86_64-defines.patch 924 RMD160 6d993fd25f1da67f3b7660
 AUX libstdc++-16.patch 253 RMD160 d1014fce3e5f56126d7a8ff647ee37e159858665 SHA1 1848bdefe769c0bb78653389c1ca2d35b4cbf4ee SHA256 f037576ba363256c61979eb68a2c1dff24445e8c5f403a729bead2c7db1f0314
 DIST gcc-5490.tar.gz 40597041 RMD160 2fea3c4a19983f28308940693d40f4f87ced828d SHA1 beed74eacce251be319747456efc144376a1f8cc SHA256 58e7ccfe086dcbc918c4321e3bb867814d5e2288d1aee431e8eb69c5205cd951
 DIST gcc-5493.tar.gz 40601890 RMD160 3566d6e5c74bdb442cfb6b20450c2b2137ef0627 SHA1 e3b1f67ff250730f5b4ee9674a1970aa7d9db399 SHA256 acdb2cc0abf049bfda433806fc82e235c6b6c5f86a0e8fd54f62ed3a8606452f
+DIST gcc-5646.tar.gz 24425101 RMD160 52dee1d9f11e10a6746eed11a9698ff45092346c SHA1 793e830afb8597ad02212f8de60150647f2c3d62 SHA256 44ec189caf8eb44511812231a1b9b5dac8b51be7d1a4eadd2420a00496874f8e
 DIST gcc-fortran-4.2.1.tar.bz2 968721 RMD160 2475594dad66277fd0c5fe42389fb8fa2665e5ce SHA1 37a0466b393ade9291dcec315c69c371e42db7f5 SHA256 9155c4685d6a2a5b07084a6c4b2186db1b22d1f1761d5f38a771c48e769bedac
 DIST gcc_42-5566.tar.gz 24217431 RMD160 8a9c6f09ca61fe07d4f61436a16fa9182c904a6a SHA1 d86d5a6c12d188d8b172b95170e08abf055fc13c SHA256 e72f9080ec6f249a1e71670eab37933dce8a1bb6936c7f08fb11912237963285
 DIST gcc_42-5574.tar.gz 24234411 RMD160 d4f3753ef91ae3f9b0481df508f962a567e9810b SHA1 40c9fef3a02cc8d7e2cc92ef5481b27c9be7de66 SHA256 0b76ef3cded7822e3c0ec430f9811b6bb84895055b683acd2df7f7253d745a50
 DIST gcc_os_35-3506.tar.gz 35791881 RMD160 6bc96f5078ef02887ab193e6f4b24fc8c95498cb SHA1 73c3657853ac66130a39978a29fa498546d96b68 SHA256 4d50c4dc6a78b1343e3ced2abc4a8ac508bc473dcbca5b01e85418d3896b7363
 DIST libstdcxx-16.tar.gz 64695692 RMD160 c7e90a6091f89c08c3678fe149da9c38187fafcd SHA1 be03b0e08163286ff939643180bf49a90b749bc0 SHA256 a7d8041e50e110f5a503e188a05cb217f0c99c51f248a0a1387cc07a0b6f167f
+DIST libstdcxx-39.tar.gz 117081330 RMD160 3ddba697f55590138592cc7c7d0a34f8775acb34 SHA1 7eb2c353525dc8756bc8e3bfcac3e7b47d688358 SHA256 aad6c0b7aa80b8117af1868d502f7aa4d042e5f33cada853a8ba75980391c6bb
 EBUILD gcc-apple-3.5.0_p3506-r1.ebuild 4634 RMD160 b82851ab3fd3cd34470a1dba7deeb2e8b41b4aca SHA1 f7eb56c77acaa8a36884415c5dcf2345348c1cac SHA256 887b1a930aa5822be9d4052bfbc35d33b8728a17c318c957b39ce01b168a77cc
 EBUILD gcc-apple-4.0.1_p5490-r2.ebuild 8480 RMD160 e857728e76f19766dc50e4ba2c9e770aac9821b0 SHA1 f590a92831a44a83f864cb4c291407d63a285b93 SHA256 59bcbd155bc781849c429ac91266c6312674312a7fd5d42126661144f447227d
 EBUILD gcc-apple-4.0.1_p5493.ebuild 8481 RMD160 c1ee2845c6f094b0be6c017c0e13f825b68816ab SHA1 2ec830335a0f03ccc5d1680f411087054b93c390 SHA256 5a00937f0b26f8c2cf6b8ffe97f5a6f6ccb484720f4fc3f7d8979b9029be6c37
 EBUILD gcc-apple-4.2.1_p5566-r2.ebuild 10691 RMD160 0312905efd338cca36ec2f10371577ee4c3e14ad SHA1 f7013918fe5dd651108106be5588cc838b159476 SHA256 9fc40554742e3f90ce2ac200312250a3a3d41412d288b1397caa109cfd16bc79
 EBUILD gcc-apple-4.2.1_p5574.ebuild 10705 RMD160 16a1b94434583b8f2041a496ed5ff9a7096f04b9 SHA1 0503dd7b33cb61939a928d85308febf400ffc529 SHA256 a462c507e8227b3a1587c1eb38c83c4ba424e9066b727d470be0a0f6dcc2effd
-MISC ChangeLog 8906 RMD160 6dd836a4e29ec7f1cb3ca3111993a455796e4ad9 SHA1 111d1eeba2baa5a6323dd16d4880964242a94b49 SHA256 a6ff8002a15ea3d3c0ecd06c982721f22a69f3792ca0fe75f1a3fa974718c8d7
+EBUILD gcc-apple-4.2.1_p5646.ebuild 10568 RMD160 b27d6bfbc26ca20738e3ecd184092f7b5929a002 SHA1 f0f7d6ff64f1e3f09c77733b09f6f3d3502084fc SHA256 738f9d4a232a6ee64c07ea4b499b1bb36ee5dd07b7cd43d8524c6314778e9d32
+MISC ChangeLog 9130 RMD160 6925dbff6383215da48574bbca05777d146d04e3 SHA1 7aec5c21aab2819a104fc295cdd1a8b6a72471a4 SHA256 637f34d65d018a46b81ad4df2398c9dae55c21cdc2f25ffecf60f6e502ad521f
 MISC metadata.xml 440 RMD160 1e6092437bb8a8de48d6679a0802489000b2ee93 SHA1 37485b6a6b03cf46be3bd4d80e809b559c13330b SHA256 fe55903cd5820f6651e134125cfc4eeadb1322a6a06e286a246ef0f70c55c517
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild
new file mode 100644
index 000000000000..6042b2610c28
--- /dev/null
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild,v 1.1 2009/09/05 16:46:34 grobian Exp $
+
+ETYPE="gcc-compiler"
+
+inherit eutils toolchain flag-o-matic autotools prefix
+
+GCC_VERS=${PV/_p*/}
+APPLE_VERS=${PV/*_p/}
+LIBSTDCXX_APPLE_VERSION=39
+DESCRIPTION="Apple branch of the GNU Compiler Collection, Developer Tools 3.2"
+HOMEPAGE="http://gcc.gnu.org"
+SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz
+		http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-${LIBSTDCXX_APPLE_VERSION}.tar.gz
+		fortran? ( mirror://gnu/gcc/gcc-${GCC_VERS}/gcc-fortran-${GCC_VERS}.tar.bz2 )"
+LICENSE="APSL-2 GPL-2"
+
+if is_crosscompile; then
+	SLOT="${CTARGET}-42"
+else
+	SLOT="42"
+fi
+
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="fortran nls objc objc++ nocxx"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )
+	>=sys-devel/gcc-config-1.3.12-r4
+	fortran? (
+		>=dev-libs/gmp-4.2.1
+		>=dev-libs/mpfr-2.2.0_p10
+	)"
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	>=sys-devel/bison-1.875
+	${CATEGORY}/binutils-apple
+	>=dev-libs/mpfr-2.2.0_p10"
+
+S=${WORKDIR}/gcc-${APPLE_VERS}
+
+# TPREFIX is the prefix of the CTARGET installation
+export TPREFIX=${TPREFIX:-${EPREFIX}}
+
+LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+if is_crosscompile ; then
+	BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+else
+	BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
+fi
+STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Support for fortran
+	if use fortran ; then
+		cd "${WORKDIR}"/gcc-${GCC_VERS}
+		# hmmm, just use rsync?
+		tar cf - * | ( cd "${S}" && tar xf - )
+		cd "${S}"
+		# from: http://r.research.att.com/tools/
+		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-gfortran.patch
+	fi
+
+	# we use our libtool
+	sed -i -e "s:/usr/bin/libtool:${EPREFIX}/usr/bin/${CTARGET}-libtool:" \
+		gcc/config/darwin.h || die "sed gcc/config/darwin.h failed"
+	# add prefixed Frameworks to default search paths (may want to change this
+	# in a cross-compile)
+	sed -i -e "/\"\/System\/Library\/Frameworks\"\,/i\ \   \"${EPREFIX}/Frameworks\"\, " \
+		gcc/config/darwin-c.c || die "sed  gcc/config/darwin-c.c failed"
+
+	# Workaround deprecated "+Nc" syntax for GNU tail(1)
+	sed -i -e "s:tail +16c:tail -c +16:g" \
+		gcc/Makefile.in || die "sed gcc/Makefile.in failed."
+
+	epatch "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch
+	#epatch "${FILESDIR}"/${PN}-4.2.1_p5566-x86_64-defines.patch
+
+	# dsymutil stuff breaks on 10.4/x86, revert it
+	[[ ${CHOST} == *86*-apple-darwin8 ]] && \
+		epatch "${FILESDIR}"/${PN}-${GCC_VERS}-dsymutil.patch
+
+	# bootstrapping might fail with host provided gcc on 10.4/x86
+	if ! is_crosscompile && ! echo "int main(){return 0;}" | gcc -o "${T}"/foo \
+		-mdynamic-no-pic -x c - >/dev/null 2>&1;
+	then
+		einfo "-mdynamic-no-pic doesn't work - disabling..."
+		echo "BOOT_CFLAGS=-g -O2" > config/mh-x86-darwin
+		XD=gcc/config/i386/x-darwin
+		awk 'BEGIN{x=1}{if ($0 ~ "use -mdynamic-no-pic to build x86")
+		{x=1-x} else if (x) print}' $XD > t && mv t $XD \
+			|| die "Failed to rewrite $XD"
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs.patch
+	eprefixify "${S}"/gcc/gcc.c
+
+	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch
+	cd "${S}"/gcc && eautoconf
+	cd "${S}"/libgomp && eautoconf
+}
+
+src_compile() {
+	local langs="c"
+	use nocxx || langs="${langs},c++"
+	use objc && langs="${langs},objc"
+	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
+	use fortran && langs="${langs},fortran"
+
+	local myconf="${myconf} \
+		--prefix=${EPREFIX}/usr \
+		--bindir=${BINPATH} \
+		--includedir=${LIBPATH}/include \
+		--datadir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS} \
+		--mandir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS}/man \
+		--infodir=${EPREFIX}/usr/share/gcc-data/${CTARGET}/${GCC_VERS}/info \
+		--with-gxx-include-dir=${STDCXX_INCDIR} \
+		--host=${CHOST}
+		--enable-version-specific-runtime-libs"
+
+	if is_crosscompile ; then
+		# Straight from the GCC install doc:
+		# "GCC has code to correctly determine the correct value for target
+		# for nearly all native systems. Therefore, we highly recommend you
+		# not provide a configure target when configuring a native compiler."
+		myconf="${myconf} --target=${CTARGET}"
+
+		# Tell compiler where to find what it needs
+		myconf="${myconf} --with-sysroot=${EPREFIX}/usr/${CTARGET}"
+
+		# Set this to something sane for both native and target
+		CFLAGS="-O2 -pipe"
+
+		local VAR="CFLAGS_"${CTARGET//-/_}
+		CXXFLAGS=${!VAR}
+	fi
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+	# Native Language Support
+	if use nls ; then
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	else
+		myconf="${myconf} --disable-nls"
+	fi
+
+	# reasonably sane globals (hopefully)
+	myconf="${myconf} \
+		--with-system-zlib \
+		--disable-checking \
+		--disable-werror"
+
+	# ???
+	myconf="${myconf} --enable-shared --enable-threads=posix"
+
+	# make clear we're in an offset
+	use prefix && myconf="${myconf} --with-local-prefix=${TPREFIX}/usr"
+
+	# we don't use a GNU linker, so tell GCC where to find the linker stuff we
+	# want it to use
+	myconf="${myconf} \
+		--with-as=${EPREFIX}/usr/bin/${CTARGET}-as \
+		--with-ld=${EPREFIX}/usr/bin/${CTARGET}-ld"
+
+	# make sure we never do multilib stuff, for that we need a different Prefix
+	[[ -z ${I_KNOW_WHAT_IM_DOING_I_WANT_APPLE_MULTILIB} ]] \
+		&& myconf="${myconf} --disable-multilib"
+
+	#libstdcxx does not support this one
+	local gccconf="${myconf} --enable-languages=${langs}"
+
+	# The produced libgcc_s.dylib is faulty if using a bit too much
+	# optimisation.  Nail it down to something sane
+	CFLAGS="-O2 -pipe"
+	CXXFLAGS=${CFLAGS}
+
+	# http://gcc.gnu.org/ml/gcc-patches/2006-11/msg00765.html
+	# (won't hurt if already 64-bits, but is essential when coming from a
+	# multilib compiler -- the default)
+	[[ ${CTARGET} == powerpc64-* || ${CTARGET} == x86_64-* ]] && \
+		export CC="gcc -m64"
+
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
+	einfo "Configuring GCC with: ${gccconf//--/\n\t--}"
+	"${S}"/configure ${gccconf} || die "conf failed"
+	emake bootstrap || die "emake failed"
+
+	local libstdcxxconf="${myconf} --disable-libstdcxx-debug"
+	mkdir -p "${WORKDIR}"/build_libstdcxx || die
+	cd "${WORKDIR}"/build_libstdcxx
+	#the build requires the gcc built before, so link to it
+	ln -s "${WORKDIR}"/build/gcc "${WORKDIR}"/build_libstdcxx/gcc || die
+	einfo "Configuring libstdcxx with: ${libstdcxxconf//--/\n\t--}"
+	"${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/configure ${libstdcxxconf} || die "conf failed"
+	emake all || die "emake failed"
+}
+
+src_install() {
+	local ED=${ED-${D}}
+
+	cd "${WORKDIR}"/build
+	# -jX doesn't work
+	emake -j1 DESTDIR="${D}" install || die
+
+	cd "${WORKDIR}"/build_libstdcxx
+	emake -j1 DESTDIR="${D}" install || die
+	cd "${WORKDIR}"/build
+
+	# Punt some tools which are really only useful while building gcc
+	find "${ED}" -name install-tools -prune -type d -exec rm -rf "{}" \;
+	# This one comes with binutils
+	find "${ED}" -name libiberty.a -exec rm -f "{}" \;
+
+	# Basic sanity check
+	if ! is_crosscompile ; then
+		local EXEEXT
+		eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log)
+		[[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${ED}"
+	fi
+
+	# create gcc-config entry
+	dodir /etc/env.d/gcc
+	local gcc_envd_base="/etc/env.d/gcc/${CHOST}-${GCC_VERS}"
+
+	gcc_envd_file="${ED}${gcc_envd_base}"
+
+	# phase PATH/ROOTPATH out ...
+	echo "PATH=\"${BINPATH}\"" > ${gcc_envd_file}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file}
+	echo "GCC_PATH=\"${BINPATH}\"" >> ${gcc_envd_file}
+
+	# we don't do multilib
+	LDPATH="${LIBPATH}"
+	echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
+	echo "MANPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/man\"" >> ${gcc_envd_file}
+	echo "INFOPATH=\"${EPREFIX}/usr/share/gcc-data/${CHOST}/${GCC_VERS}/info\"" >> ${gcc_envd_file}
+	echo "STDCXX_INCDIR=\"g++-v${GCC_VERS/\.*/}\"" >> ${gcc_envd_file}
+	is_crosscompile && echo "CTARGET=${CTARGET}" >> ${gcc_envd_file}
+
+	# Move <cxxabi.h> to compiler-specific directories
+	[[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ]] && \
+		mv -f "${D}"${STDCXX_INCDIR}/cxxabi.h "${D}"${LIBPATH}/include/
+
+	# These should be symlinks
+	dodir /usr/bin
+	cd "${D}"${BINPATH}
+	for x in cpp gcc g++ c++ g77 gcj gcjh gfortran ; do
+		# For some reason, g77 gets made instead of ${CTARGET}-g77...
+		# this should take care of that
+		[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
+
+		if [[ -f ${CTARGET}-${x} ]] && ! is_crosscompile ; then
+			ln -sf ${CTARGET}-${x} ${x}
+
+			# Create version-ed symlinks
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${CTARGET}-${x}-${GCC_VERS}
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${x}-${GCC_VERS}
+		fi
+
+		if [[ -f ${CTARGET}-${x}-${GCC_VERS} ]] ; then
+			rm -f ${CTARGET}-${x}-${GCC_VERS}
+			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_VERS}
+		fi
+	done
+
+	# I do not know if this will break gcj stuff, so I'll only do it for
+	#	objc for now; basically "ffi.h" is the correct file to include,
+	#	but it gets installed in .../GCCVER/include and yet it does
+	#	"#include <ffitarget.h>" which (correctly, as it's an "extra" file)
+	#	is installed in .../GCCVER/include/libffi; the following fixes
+	#	ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@gentoo.org>
+	if [[ -d ${D}${LIBPATH}/include/libffi ]] ; then
+		mv -i "${D}"${LIBPATH}/include/libffi/* "${D}"${LIBPATH}/include || die
+		rm -r "${D}"${LIBPATH}/include/libffi || die
+	fi
+
+	# Now do the fun stripping stuff
+	env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
+	env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
+	# gcc used to install helper binaries in lib/ but then moved to libexec/
+	[[ -d ${ED}/usr/libexec/gcc ]] && \
+		env RESTRICT="" CHOST=${CHOST} prepstrip "${ED}/usr/libexec/gcc/${CTARGET}/${GCC_VERS}"
+
+	# prune empty dirs left behind
+	find "${ED}" -type d | xargs rmdir >& /dev/null
+}
+
+pkg_postinst() {
+	# beware this also switches when it's on another branch version of GCC
+	gcc-config ${CTARGET}-${GCC_VERS}
+}
+
+pkg_postrm() {
+	local EROOT=${EROOT-${ROOT}}
+
+	# clean up the cruft left behind by cross-compilers
+	if is_crosscompile ; then
+		if [[ -z $(ls "${EROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then
+			rm -f "${EROOT}"/etc/env.d/gcc/config-${CTARGET}
+			rm -f "${EROOT}"/etc/env.d/??gcc-${CTARGET}
+			rm -f "${EROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64}
+		fi
+		return 0
+	fi
+}