Version bump to version from Developer Tools 3.2.2
authorFabian Groffen <grobian@gentoo.org>
Tue, 18 May 2010 06:42:48 +0000 (06:42 +0000)
committerFabian Groffen <grobian@gentoo.org>
Tue, 18 May 2010 06:42:48 +0000 (06:42 +0000)
Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

sys-devel/gcc-apple/ChangeLog
sys-devel/gcc-apple/Manifest
sys-devel/gcc-apple/gcc-apple-4.2.1_p5659.ebuild [new file with mode: 0644]

index 60f36f8bf76db43aebc5127db785a086be33fe40..225c19b1b7ae5c64e6293ef629d693b07b8d768d 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc-apple
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.16 2010/05/02 14:53:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.17 2010/05/18 06:42:48 grobian Exp $
+
+*gcc-apple-4.2.1_p5659 (18 May 2010)
+
+  18 May 2010; Fabian Groffen <grobian@gentoo.org>
+  +gcc-apple-4.2.1_p5659.ebuild:
+  Version bump to version from Developer Tools 3.2.2
 
   02 May 2010; Fabian Groffen <grobian@gentoo.org>
   gcc-apple-4.2.1_p5647.ebuild:
index 61a95a2b5551b352792af7d5e35f857c32e914ca..d53c3e3e69dfce9f5524ee23e2e5223fd34915cf 100644 (file)
@@ -12,6 +12,7 @@ DIST gcc-5490.tar.gz 40597041 RMD160 2fea3c4a19983f28308940693d40f4f87ced828d SH
 DIST gcc-5493.tar.gz 40601890 RMD160 3566d6e5c74bdb442cfb6b20450c2b2137ef0627 SHA1 e3b1f67ff250730f5b4ee9674a1970aa7d9db399 SHA256 acdb2cc0abf049bfda433806fc82e235c6b6c5f86a0e8fd54f62ed3a8606452f
 DIST gcc-5646.1.tar.gz 24424061 RMD160 35dec9434b0311ba63bf83d8c47b0b39450e1e1a SHA1 5ec8baa54430f8594320ee72410f1a70a4303ac6 SHA256 71dd89ef93e47884216296d39a3f31755844e4aa34a60213213df6a0dd5d4342
 DIST gcc-5646.tar.gz 24425101 RMD160 52dee1d9f11e10a6746eed11a9698ff45092346c SHA1 793e830afb8597ad02212f8de60150647f2c3d62 SHA256 44ec189caf8eb44511812231a1b9b5dac8b51be7d1a4eadd2420a00496874f8e
+DIST gcc-5659.tar.gz 24632085 RMD160 43dd0bc08969657594a9068685695cd1588b4f88 SHA1 d16405b54015e07ed1ba1688cfd7d10c4c79bd9b SHA256 ca547fe1fbda5863399937d0e6f91e58b143c27884f08630459477b25ac980ba
 DIST gcc-fortran-4.2.1.tar.bz2 968721 RMD160 2475594dad66277fd0c5fe42389fb8fa2665e5ce SHA1 37a0466b393ade9291dcec315c69c371e42db7f5 SHA256 9155c4685d6a2a5b07084a6c4b2186db1b22d1f1761d5f38a771c48e769bedac
 DIST gcc-fortran-4.2.4.tar.bz2 905688 RMD160 83694f8140dfd6b642449f2b262153a74e983c73 SHA1 7b476983f8b8405a456b30704cd91c7b238381c9 SHA256 6fc2056cd62921b2859381749710af765a46877bd46f9fe5ef6fab0671c47e04
 DIST gcc_42-5566.tar.gz 24217431 RMD160 8a9c6f09ca61fe07d4f61436a16fa9182c904a6a SHA1 d86d5a6c12d188d8b172b95170e08abf055fc13c SHA256 e72f9080ec6f249a1e71670eab37933dce8a1bb6936c7f08fb11912237963285
@@ -26,5 +27,6 @@ EBUILD gcc-apple-4.2.1_p5566-r2.ebuild 10829 RMD160 8999218072ec2f98dca8bb77f9e7
 EBUILD gcc-apple-4.2.1_p5574.ebuild 10843 RMD160 954e8e1dda7435ed9239aef0a31c22a251299e52 SHA1 52bb5ec4865474177592587f617fa9e112439c91 SHA256 c45309947cdff4e24cc127526ff650585788f569b1200fe3e11e1ecc29b33cdd
 EBUILD gcc-apple-4.2.1_p5646.ebuild 11284 RMD160 fa8565150fcae722e94f0d2e83f54f0206926dc8 SHA1 8e83b44349bc7f0daa7ccb2db917183ddca78a2d SHA256 682aaca8906ab9b23d2c58b37bdbbcd38c3c1422baef6a77008bfa855da94590
 EBUILD gcc-apple-4.2.1_p5647.ebuild 11504 RMD160 24014bc83b6bb5e485c53750e1012ecbb56d89bf SHA1 ad7ec68383a0670f45c0c80212f4ceae028efbef SHA256 77a5849b0a9b82a893dbe12f642b598df1c76cbfb3b6eca8cc610a21d9745f3e
-MISC ChangeLog 11722 RMD160 a35b516cca86c347df5a857cb92dabfa4060308b SHA1 265c49d14d1fb18b866eec68b3aed4920888ba03 SHA256 642a36a60a252ef203e65f1e919e12e87bee28b9b4fe30f02d42cb41fe8348e2
+EBUILD gcc-apple-4.2.1_p5659.ebuild 11450 RMD160 1446e0f0e8788b095e89fb73b8727377ddc3d5a7 SHA1 4f7d22a8a14b6f66764058ba0948eacc7ec61f46 SHA256 d58361d2455f3762df4623f4473e662c2c99f8f2dfe8b4014d9e9ffc8ecf6d6b
+MISC ChangeLog 11898 RMD160 a1ce95f843ee58da3e3837147b1194bc50185403 SHA1 5192de3a7943c24ca871fd35b9ea4e6d2e3095ce SHA256 7e59b1d4c9c5cea86198a203caeb681c3bddb26d70288284fa047fea6f2051f3
 MISC metadata.xml 440 RMD160 1e6092437bb8a8de48d6679a0802489000b2ee93 SHA1 37485b6a6b03cf46be3bd4d80e809b559c13330b SHA256 fe55903cd5820f6651e134125cfc4eeadb1322a6a06e286a246ef0f70c55c517
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5659.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5659.ebuild
new file mode 100644 (file)
index 0000000..1108baf
--- /dev/null
@@ -0,0 +1,334 @@
+# Copyright 1999-2010 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_p5659.ebuild,v 1.1 2010/05/18 06:42:48 grobian Exp $
+
+EAPI="3"
+
+ETYPE="gcc-compiler"
+
+inherit eutils toolchain flag-o-matic autotools prefix
+
+GCC_VERS=${PV/_p*/}
+APPLE_VERS="${PV/*_p/}"
+DESCRIPTION="Apple branch of the GNU Compiler Collection, Developer Tools 3.2.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-16.tar.gz
+               http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz
+               fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )"
+LICENSE="GPL-2 GPL-3"
+
+case ${CHOST} in
+       *-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
+               LIBSTDCXX_APPLE_VERSION=39
+       ;;
+       *)
+               # pre Leopard has no dtrace, which is required by 37.11 and above
+               # Leopard only has 32-bits version of dtrace
+               LIBSTDCXX_APPLE_VERSION=16
+       ;;
+esac
+
+if is_crosscompile; then
+       SLOT="${CTARGET}-42"
+else
+       SLOT="42"
+fi
+
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="fortran nls +openmp 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() {
+       # override toolchain.eclass func
+       unpack ${A}
+}
+
+src_prepare() {
+       # Support for fortran
+       if use fortran ; then
+               mv "${WORKDIR}"/gcc-4.2.4/gcc/fortran gcc/ || die
+               mv "${WORKDIR}"/gcc-4.2.4/libgfortran . || die
+               # from: substracted from http://r.research.att.com/tools/
+               epatch "${FILESDIR}"/${PN}-4.2.1_p5646-gfortran.patch
+       fi
+
+       # move in libstdc++
+       mv "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/libstdc++-v3 .
+       if [[ ${LIBSTDCXX_APPLE_VERSION} == 16 ]] ; then
+               epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch # does it apply on 37?
+               sed -i -e 's/__block\([^_]\)/__blk\1/g' \
+                       libstdc++-v3/include/ext/mt_allocator.h \
+                       libstdc++-v3/src/mt_allocator.cc || die "conflict fix failed"
+       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
+
+       # 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
+
+       if use !bootstrap ; then
+               # this only occurs with up-to-date tools from the Prefix, and actually
+               # breaks the bootstrap since the autoconf needs a very recent automake
+               epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch
+               epatch "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch
+               cd "${S}"/gcc && eautoconf
+               cd "${S}"/libgomp && eautoconf
+       fi
+
+       local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)"
+       BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, }
+       einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}"
+
+       sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \
+               "${S}"/gcc/version.c || die "failed to update VERSUFFIX with Gentoo branding"
+       sed -i -e 's~developer\.apple\.com\/bugreporter~bugs\.gentoo\.org\/~' \
+               "${S}"/gcc/version.c || die "Failed to change the bug URL"
+}
+
+src_configure() {
+       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"
+
+       myconf="${myconf} --enable-languages=${langs} $(use_enable openmp libgomp)"
+
+       # 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: ${myconf//--/\n\t--}"
+       "${S}"/configure ${myconf} || die "conf failed"
+}
+
+src_compile() {
+       cd "${WORKDIR}"/build || die
+       emake bootstrap || die "emake failed"
+}
+
+src_install() {
+       cd "${WORKDIR}"/build
+       # -jX doesn't work
+       emake -j1 DESTDIR="${D}" install || die
+
+       # 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() {
+       # 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
+}