From 98ee04084cbb599e864a72604175f1069350fe36 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 8 Jun 2004 01:45:07 +0000 Subject: Fix #30849 and clean up the ebuild in general --- sys-devel/gcc/ChangeLog | 8 +- sys-devel/gcc/Manifest | 12 +- sys-devel/gcc/files/digest-gcc-3.1.1-r1 | 2 - sys-devel/gcc/files/digest-gcc-3.1.1-r2 | 2 + sys-devel/gcc/gcc-3.1.1-r1.ebuild | 354 -------------------------------- sys-devel/gcc/gcc-3.1.1-r2.ebuild | 345 +++++++++++++++++++++++++++++++ 6 files changed, 360 insertions(+), 363 deletions(-) delete mode 100644 sys-devel/gcc/files/digest-gcc-3.1.1-r1 create mode 100644 sys-devel/gcc/files/digest-gcc-3.1.1-r2 delete mode 100644 sys-devel/gcc/gcc-3.1.1-r1.ebuild create mode 100644 sys-devel/gcc/gcc-3.1.1-r2.ebuild (limited to 'sys-devel') diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 158278910784..f41b1bf726dc 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/gcc # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.266 2004/06/05 22:20:41 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.267 2004/06/08 01:45:07 vapier Exp $ + +*gcc-3.1.1-r2 (07 Jun 2004) + + 07 Jun 2004; Mike Frysinger -gcc-3.1.1-r1.ebuild, + +gcc-3.1.1-r2.ebuild: + Fix long standing env bug #30849 and use epatch instead of patch. 05 Jun 2004; Travis Tilley +files/3.4.0/reiser4-why-do-you-hate-me.patch, gcc-3.4.0-r6.ebuild: diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index a1018a8ce7c9..4a6382eb1aae 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 86661ba0ca338a2783dd95296df291f3 ChangeLog 55289 +MD5 a4150c4f20e679e52408ed1357e6224d ChangeLog 55486 +MD5 5c06c7b9c6fd156d3bd1383323c3e2e2 gcc-3.1.1-r2.ebuild 9167 MD5 ff1e34206f0acd8bf35fdfe97d7416d4 gcc-2.95.3-r8.ebuild 9108 MD5 f6c84e13f0ffb79fa7856b2f7a3a1e63 gcc-3.0.4-r6.ebuild 8460 MD5 3a2e4f5d5f2d94e5ee2a399ab3b0f32e gcc-3.3-r1.ebuild 16506 -MD5 ca02ab22b16026345e426c4698eb3058 gcc-3.1.1-r1.ebuild 9451 MD5 b5f1d4d71ad38c5c5e489466ac0ad399 gcc-3.3.3-r3.ebuild 24690 MD5 b33c1f60ade8ee3d1ad43023d788952a gcc-3.3.3-r6.ebuild 25264 MD5 fafb9acfeb8b7e2206d43e41ea031f90 gcc-3.4.0-r6.ebuild 29802 @@ -31,10 +31,10 @@ MD5 3b2fd4637666e71aae9954782cd23016 gcc-3.3.3_pre20040426.ebuild 22633 MD5 66229a95f7bb2856fd07dfd0d6589480 gcc-3.3.3-r5.ebuild 25326 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24 +MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r2 140 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64 MD5 4a4be6eb294e00da7fef14ec597dcf13 files/digest-gcc-3.0.4-r6 128 MD5 5a9db19cd5ad6ad16b0f838d525d842a files/digest-gcc-3.3.3-r3 522 -MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140 MD5 651abb651e5fdcec7c83354b5742d26d files/digest-gcc-3.4.0-r6 443 MD5 3fd5a29d44b89f4fb220fccaa968fc05 files/digest-gcc-3.3.3-r6 442 MD5 9c13e6b0d5770979430b76c578afa22c files/gcc3-program-transform.patch 9771 @@ -137,7 +137,7 @@ MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/reiser4-why-do-you-hate-me.patc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.8 (GNU/Linux) -iD8DBQFAxRYlHTu7gpaalycRAuj+AKDaQjIwTa5060oxhIlayeKSCPGFigCgjuVd -IqhdlSaA3jn/n5Xl1yPcJYY= -=tl42 +iD8DBQFAxRosHTu7gpaalycRAh1wAJ9ykZdbRwSpsmeUgDc/WnyI7caUTACfVFDC +2O6YGpC2lwVEGgCB/iq9XQ4= +=4qj+ -----END PGP SIGNATURE----- diff --git a/sys-devel/gcc/files/digest-gcc-3.1.1-r1 b/sys-devel/gcc/files/digest-gcc-3.1.1-r1 deleted file mode 100644 index 4306377f63b0..000000000000 --- a/sys-devel/gcc/files/digest-gcc-3.1.1-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 7269d2f24ab9188652ac17cd9545f511 gcc-3.1.1.tar.bz2 20515451 -MD5 0ff638960d988a20c1168f910059f961 gcc-3.1.1_final-patches-1.0.tbz2 29791 diff --git a/sys-devel/gcc/files/digest-gcc-3.1.1-r2 b/sys-devel/gcc/files/digest-gcc-3.1.1-r2 new file mode 100644 index 000000000000..4306377f63b0 --- /dev/null +++ b/sys-devel/gcc/files/digest-gcc-3.1.1-r2 @@ -0,0 +1,2 @@ +MD5 7269d2f24ab9188652ac17cd9545f511 gcc-3.1.1.tar.bz2 20515451 +MD5 0ff638960d988a20c1168f910059f961 gcc-3.1.1_final-patches-1.0.tbz2 29791 diff --git a/sys-devel/gcc/gcc-3.1.1-r1.ebuild b/sys-devel/gcc/gcc-3.1.1-r1.ebuild deleted file mode 100644 index 4d84e9ca99e7..000000000000 --- a/sys-devel/gcc/gcc-3.1.1-r1.ebuild +++ /dev/null @@ -1,354 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.1-r1.ebuild,v 1.16 2004/06/07 23:37:08 vapier Exp $ - -# NOTE TO MAINTAINER: Info pages get nuked for multiple version installs. -# Ill fix it later if i get a chance. -# -# IMPORTANT: The versions of libs installed should be updated -# in src_install() ... Ill implement auto-version detection -# later on. - -inherit flag-o-matic libtool - -do_filter_flags() { - # Compile problems with these ... - filter-flags -fno-exceptions - - # In general gcc does not like optimization, and add -O2 where - # it is safe. - filter-flags -O? -} - -MY_PV="`echo ${PV} | cut -d. -f1,2`" -GCC_SUFFIX=-${MY_PV} -LOC="/usr" -# dont install in /usr/include/g++-v3/, as it will nuke gcc-3.0.x installs -STDCXX_INCDIR="${LOC}/include/g++-v${MY_PV/\./}" -PATCHES="${WORKDIR}/patches" - -DESCRIPTION="Modern GCC C/C++ compiler" -HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" -SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.bz2 - http://www.ibiblio.org/gentoo/distfiles/${P}_final-patches-1.0.tbz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="${MY_PV}" -KEYWORDS="x86 sparc -ppc" -IUSE="static nls bootstrap java build" - -DEPEND="virtual/glibc - !build? ( >=sys-libs/ncurses-5.2-r2 - nls? ( sys-devel/gettext ) )" -RDEPEND="virtual/glibc - >=sys-libs/zlib-1.1.4 - >=sys-apps/texinfo-4.2-r4 - !build? ( >=sys-libs/ncurses-5.2-r2 )" - -build_multiple() { - #try to make sure that we should build multiple - #versions of gcc (dual install of gcc2 and gcc3) - profile="`readlink /etc/make.profile`" - # [ "`gcc -dumpversion | cut -d. -f1,2`" != "`echo ${PV} | cut -d. -f1,2`" ] - # - # Check the major and minor versions only, and drop the micro version. - # This is done, as compadibility only differ when major and minor differ. - if ! use build && ! use bootstrap && \ - [ "`gcc -dumpversion | cut -d. -f1,2`" != "${MY_PV}" ] && \ - [ "${profile/gcc3}" = "${profile}" ] && \ - [ "${GCCBUILD}" != "default" ] - then - return 0 - else - return 1 - fi -} - -# used to patch Makefiles to install into the build dir -FAKE_ROOT="" - -src_unpack() { - unpack ${P}.tar.bz2 - - mkdir -p ${WORKDIR}/patches - tar -jxf ${DISTDIR}/${P}_final-patches-1.0.tbz2 -C ${WORKDIR}/patches || \ - die "Could not unpack patches" - - cd ${S} - # Fixup libtool to correctly generate .la files with portage - elibtoolize --portage --shallow - - for x in ${PATCHES}/*.patch - do - # sad to say booboo I relised *after* uploading the patch to ibiblio :( - if [ "${x##*/}" = "28_gcc31-c++-diagnostic-no-line-wrapping.patch" ] - then - patch -p1 < ${x} || die "Failed with patch ${x##*/}" - else - patch -p0 < ${x} || die "Failed with patch ${x##*/}" - fi - done - - # Currently if any path is changed via the configure script, it breaks - # installing into ${D}. We should not patch it in src_install() with - # absolute paths, as some modules then gets rebuild with the wrong - # paths. Thus we use $FAKE_ROOT. - cd ${S} - for x in $(find . -name Makefile.in) - do -# cp ${x} ${x}.orig - # Fix --datadir= -# sed -e 's:datadir = @datadir@:datadir = $(FAKE_ROOT)@datadir@:' \ -# ${x}.orig > ${x} - cp ${x} ${x}.orig - # Fix --with-gxx-include-dir= - sed -e 's:gxx_include_dir = @gxx_:gxx_include_dir = $(FAKE_ROOT)@gxx_:' \ - -e 's:glibcppinstalldir = @gxx_:glibcppinstalldir = $(FAKE_ROOT)@gxx_:' \ - ${x}.orig > ${x} - rm -f ${x}.orig - done -} - -src_compile() { - local myconf="" - local gcc_lang="" - if ! use build - then - myconf="${myconf} --enable-shared" - gcc_lang="c,c++,f77,objc" - else - gcc_lang="c" - fi - if ! use nls || use build - then - myconf="${myconf} --disable-nls" - else - myconf="${myconf} --enable-nls --without-included-gettext" - fi - if use java && ! use build - then - gcc_lang="${gcc_lang},java" - fi - - #only build with a program suffix if it is not our - #default compiler. Also check $GCCBUILD until we got - #compilers sorted out. - # - #NOTE: for software to detirmine gcc version, it will be easier - # if we have gcc, gcc-3.0 and gcc-3.1, and NOT gcc-3.0.4. - if build_multiple - then - myconf="${myconf} --program-suffix=${GCC_SUFFIX}" - fi - - # Make sure we have sane CFLAGS - do_filter_flags - - #build in a separate build tree - mkdir -p ${WORKDIR}/build - cd ${WORKDIR}/build - - addwrite "/dev/zero" - ${S}/configure --prefix=${LOC} \ - --mandir=${LOC}/share/man \ - --infodir=${LOC}/share/info \ - --enable-shared \ - --host=${CHOST} \ - --build=${CHOST} \ - --target=${CHOST} \ - --with-system-zlib \ - --enable-languages=${gcc_lang} \ - --enable-threads=posix \ - --enable-long-long \ - --disable-checking \ - --enable-cstdio=stdio \ - --enable-clocale=generic \ - --enable-version-specific-runtime-libs \ - --with-gxx-include-dir=${STDCXX_INCDIR} \ - --with-local-prefix=${LOC}/local \ - ${myconf} || die - - touch ${S}/gcc/c-gperf.h - - if ! use static - then - #fix for our libtool-portage.patch - S="${WORKDIR}/build" \ - emake bootstrap-lean || die - else - S="${WORKDIR}/build" \ - emake LDFLAGS=-static bootstrap || die - fi -} - -src_install() { - #make install from the build directory - cd ${WORKDIR}/build - S="${WORKDIR}/build" \ - make prefix=${D}${LOC} \ - mandir=${D}${LOC}/share/man \ - infodir=${D}${LOC}/share/info \ - FAKE_ROOT=${D} \ - install || die - - if ! build_multiple - then - GCC_SUFFIX="" - fi - - [ -e ${D}${LOC}/bin/gcc${GCC_SUFFIX} ] || die "gcc not found in ${D}" - - FULLPATH=${LOC}/lib/gcc-lib/${CHOST}/${PV} - FULLPATH_D=${D}${LOC}/lib/gcc-lib/${CHOST}/${PV} - cd ${FULLPATH_D} - dodir /lib - dodir /etc/env.d - echo "LDPATH=${FULLPATH}" > ${D}/etc/env.d/05gcc${GCC_SUFFIX} - if ! build_multiple - then - dosym /usr/bin/cpp /lib/cpp - dosym gcc /usr/bin/cc - fi - - # gcc-3.1 have a problem with the ordering of Search Directories. For - # instance, if you have libreadline.so in /lib, and libreadline.a in - # /usr/lib, then it will link with libreadline.a instead of .so. As far - # as I can see from the source, /lib should be searched before /usr/lib, - # and this also differs from gcc-2.95.3 and possibly 3.0.4, but ill have - # to check on 3.0.4. Thanks to Daniel Robbins for noticing this oddity, - # bugzilla bug #4411 - # - # Azarah - 3 Jul 2002 - # - cd ${FULLPATH_D} - dosed -e "s:%{L\*} %(link_libgcc):%{L\*} -L/lib %(link_libgcc):" \ - ${FULLPATH}/specs - - #make sure we dont have stuff lying around that - #can nuke multiple versions of gcc - if ! use build - then - cd ${FULLPATH_D} - - #Tell libtool files where real libraries are - for LA in ${D}${LOC}/lib/*.la ${FULLPATH_D}/../*.la - do - if [ -f ${LA} ] - then - sed -e "s:/usr/lib:${FULLPATH}:" ${LA} > ${LA}.hacked - mv ${LA}.hacked ${LA} - mv ${LA} ${FULLPATH_D} - fi - done - - #move all the libraries to version specific libdir. - for x in ${D}${LOC}/lib/*.{so,a}* ${FULLPATH_D}/../*.{so,a}* - do - [ -f ${x} ] && mv -f ${x} ${FULLPATH_D} - done - - #move Java headers to compiler-specific dir - for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h - do - [ -f ${x} ] && mv -f ${x} ${FULLPATH_D}/include/ - done - for x in gcj gnu java javax org - do - if [ -d ${D}${LOC}/include/${x} ] - then - mkdir -p ${FULLPATH_D}/include/${x} - mv -f ${D}${LOC}/include/${x}/* ${FULLPATH_D}/include/${x}/ - rm -rf ${D}${LOC}/include/${x} - fi - done - - #move libgcj.spec to compiler-specific directories - [ -f ${D}${LOC}/lib/libgcj.spec ] && \ - mv -f ${D}${LOC}/lib/libgcj.spec ${FULLPATH_D}/libgcj.spec - - #rename jar because it could clash with Kaffe's jar if this gcc is - #primary compiler (aka don't have the - extension) - cd ${D}${LOC}/bin - [ -f jar${GCC_SUFFIX} ] && mv -f jar${GCC_SUFFIX} gcj-jar${GCC_SUFFIX} - - #move to compiler-specific directories - [ -f ${D}${STDCXX_INCDIR}/cxxabi.h ] && \ - mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${FULLPATH_D}/include/ - - if build_multiple - then - #now fix the manpages - cd ${D}${LOC}/share/man/man1 - mv cpp.1 cpp${GCC_SUFFIX}.1 - mv gcov.1 gcov${GCC_SUFFIX}.1 - fi - fi - - #this one comes with binutils - if [ -f ${D}${LOC}/lib/libiberty.a ] - then - rm -f ${D}${LOC}/lib/libiberty.a - fi - - cd ${S} - if ! use build - then - cd ${S} - docinto / - dodoc ChangeLog LAST_UPDATED README MAINTAINERS - cd ${S}/boehm-gc - docinto boehm-gc - dodoc ChangeLog doc/{README*,barrett_diagram} - docinto boehm-gc/html - dohtml doc/*.html - cd ${S}/gcc - docinto gcc - dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS \ - README* SERVICE - cd ${S}/libf2c - docinto libf2c - dodoc ChangeLog README TODO changes.netlib disclaimer.netlib \ - permission.netlib readme.netlib - cd ${S}/libffi - docinto libffi - dodoc ChangeLog* README - cd ${S}/libiberty - docinto libiberty - dodoc ChangeLog README - cd ${S}/libobjc - docinto libobjc - dodoc ChangeLog README* THREADS* - cd ${S}/libstdc++-v3 - docinto libstdc++-v3 - dodoc ChangeLog* README - - if use java - then - cd ${S}/fastjar - docinto fastjar - dodoc AUTHORS CHANGES ChangeLog NEWS README - cd ${S}/libjava - docinto libjava - dodoc ChangeLog* HACKING NEWS README THANKS - fi - else - rm -rf ${D}/usr/share/{man,info} - fi - - # Fix ncurses b0rking - find ${D}/ -name '*curses.h' -exec rm -f {} \; -} - -pkg_postrm() { - if [ ! -L ${ROOT}/lib/cpp ] - then - ln -sf /usr/bin/cpp ${ROOT}/lib/cpp - fi - if [ ! -L ${ROOT}/usr/bin/cc ] - then - ln -sf gcc ${ROOT}/usr/bin/cc - fi - - # Fix ncurses b0rking (if r5 isn't unmerged) - find ${ROOT}/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \; -} diff --git a/sys-devel/gcc/gcc-3.1.1-r2.ebuild b/sys-devel/gcc/gcc-3.1.1-r2.ebuild new file mode 100644 index 000000000000..5f7008b4a3b8 --- /dev/null +++ b/sys-devel/gcc/gcc-3.1.1-r2.ebuild @@ -0,0 +1,345 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.1-r2.ebuild,v 1.1 2004/06/08 01:45:07 vapier Exp $ + +# NOTE TO MAINTAINER: Info pages get nuked for multiple version installs. +# Ill fix it later if i get a chance. +# +# IMPORTANT: The versions of libs installed should be updated +# in src_install() ... Ill implement auto-version detection +# later on. + +inherit flag-o-matic libtool eutils + +do_filter_flags() { + # Compile problems with these ... + filter-flags -fno-exceptions + + # In general gcc does not like optimization, and add -O2 where + # it is safe. + filter-flags -O? +} + +MY_PV="`echo ${PV} | cut -d. -f1,2`" +GCC_SUFFIX=-${MY_PV} +LOC="/usr" +# dont install in /usr/include/g++-v3/, as it will nuke gcc-3.0.x installs +STDCXX_INCDIR="${LOC}/include/g++-v${MY_PV/\./}" + +DESCRIPTION="Modern GCC C/C++ compiler" +HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" +SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.bz2 + http://www.ibiblio.org/gentoo/distfiles/${P}_final-patches-1.0.tbz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="${MY_PV}" +KEYWORDS="x86 sparc -ppc" +IUSE="static nls bootstrap java build" + +DEPEND="virtual/glibc + !build? ( >=sys-libs/ncurses-5.2-r2 + nls? ( sys-devel/gettext ) )" +RDEPEND="virtual/glibc + >=sys-libs/zlib-1.1.4 + >=sys-apps/texinfo-4.2-r4 + !build? ( >=sys-libs/ncurses-5.2-r2 )" + +build_multiple() { + #try to make sure that we should build multiple + #versions of gcc (dual install of gcc2 and gcc3) + profile="`readlink /etc/make.profile`" + # [ "`gcc -dumpversion | cut -d. -f1,2`" != "`echo ${PV} | cut -d. -f1,2`" ] + # + # Check the major and minor versions only, and drop the micro version. + # This is done, as compadibility only differ when major and minor differ. + if ! use build && ! use bootstrap && \ + [ "`gcc -dumpversion | cut -d. -f1,2`" != "${MY_PV}" ] && \ + [ "${profile/gcc3}" = "${profile}" ] && \ + [ "${GCCBUILD}" != "default" ] + then + return 0 + else + return 1 + fi +} + +# used to patch Makefiles to install into the build dir +FAKE_ROOT="" + +src_unpack() { + unpack ${P}.tar.bz2 + + cd ${S} + # Fixup libtool to correctly generate .la files with portage + elibtoolize --portage --shallow + + mkdir -p ${WORKDIR}/patch + tar -jxf ${DISTDIR}/${P}_final-patches-1.0.tbz2 -C ${WORKDIR}/patch \ + || die "Could not unpack patches" + for f in ${WORKDIR}/patch/*.patch ; do + epatch ${f} + done + + # Currently if any path is changed via the configure script, it breaks + # installing into ${D}. We should not patch it in src_install() with + # absolute paths, as some modules then gets rebuild with the wrong + # paths. Thus we use $FAKE_ROOT. + cd ${S} + for x in $(find . -name Makefile.in) + do +# cp ${x} ${x}.orig + # Fix --datadir= +# sed -e 's:datadir = @datadir@:datadir = $(FAKE_ROOT)@datadir@:' \ +# ${x}.orig > ${x} + cp ${x} ${x}.orig + # Fix --with-gxx-include-dir= + sed -e 's:gxx_include_dir = @gxx_:gxx_include_dir = $(FAKE_ROOT)@gxx_:' \ + -e 's:glibcppinstalldir = @gxx_:glibcppinstalldir = $(FAKE_ROOT)@gxx_:' \ + ${x}.orig > ${x} + rm -f ${x}.orig + done +} + +src_compile() { + local myconf="" + local gcc_lang="" + if ! use build + then + myconf="${myconf} --enable-shared" + gcc_lang="c,c++,f77,objc" + else + gcc_lang="c" + fi + if ! use nls || use build + then + myconf="${myconf} --disable-nls" + else + myconf="${myconf} --enable-nls --without-included-gettext" + fi + if use java && ! use build + then + gcc_lang="${gcc_lang},java" + fi + + #only build with a program suffix if it is not our + #default compiler. Also check $GCCBUILD until we got + #compilers sorted out. + # + #NOTE: for software to detirmine gcc version, it will be easier + # if we have gcc, gcc-3.0 and gcc-3.1, and NOT gcc-3.0.4. + if build_multiple + then + myconf="${myconf} --program-suffix=${GCC_SUFFIX}" + fi + + # Make sure we have sane CFLAGS + do_filter_flags + + #build in a separate build tree + mkdir -p ${WORKDIR}/build + cd ${WORKDIR}/build + + addwrite "/dev/zero" + ${S}/configure --prefix=${LOC} \ + --mandir=${LOC}/share/man \ + --infodir=${LOC}/share/info \ + --enable-shared \ + --host=${CHOST} \ + --build=${CHOST} \ + --target=${CHOST} \ + --with-system-zlib \ + --enable-languages=${gcc_lang} \ + --enable-threads=posix \ + --enable-long-long \ + --disable-checking \ + --enable-cstdio=stdio \ + --enable-clocale=generic \ + --enable-version-specific-runtime-libs \ + --with-gxx-include-dir=${STDCXX_INCDIR} \ + --with-local-prefix=${LOC}/local \ + ${myconf} || die + + touch ${S}/gcc/c-gperf.h + + if ! use static + then + #fix for our libtool-portage.patch + S="${WORKDIR}/build" \ + emake bootstrap-lean || die + else + S="${WORKDIR}/build" \ + emake LDFLAGS=-static bootstrap || die + fi +} + +src_install() { + #make install from the build directory + cd ${WORKDIR}/build + S="${WORKDIR}/build" \ + make prefix=${D}${LOC} \ + mandir=${D}${LOC}/share/man \ + infodir=${D}${LOC}/share/info \ + FAKE_ROOT=${D} \ + install || die + + if ! build_multiple + then + GCC_SUFFIX="" + fi + + [ -e ${D}${LOC}/bin/gcc${GCC_SUFFIX} ] || die "gcc not found in ${D}" + + FULLPATH=${LOC}/lib/gcc-lib/${CHOST}/${PV} + FULLPATH_D=${D}${LOC}/lib/gcc-lib/${CHOST}/${PV} + cd ${FULLPATH_D} + dodir /lib + dodir /etc/env.d + echo "LDPATH=${FULLPATH}" > ${D}/etc/env.d/05gcc${GCC_SUFFIX} + if ! build_multiple + then + dosym /usr/bin/cpp /lib/cpp + dosym gcc /usr/bin/cc + fi + + # gcc-3.1 have a problem with the ordering of Search Directories. For + # instance, if you have libreadline.so in /lib, and libreadline.a in + # /usr/lib, then it will link with libreadline.a instead of .so. As far + # as I can see from the source, /lib should be searched before /usr/lib, + # and this also differs from gcc-2.95.3 and possibly 3.0.4, but ill have + # to check on 3.0.4. Thanks to Daniel Robbins for noticing this oddity, + # bugzilla bug #4411 + # + # Azarah - 3 Jul 2002 + # + cd ${FULLPATH_D} + dosed -e "s:%{L\*} %(link_libgcc):%{L\*} -L/lib %(link_libgcc):" \ + ${FULLPATH}/specs + + #make sure we dont have stuff lying around that + #can nuke multiple versions of gcc + if ! use build + then + cd ${FULLPATH_D} + + #Tell libtool files where real libraries are + for LA in ${D}${LOC}/lib/*.la ${FULLPATH_D}/../*.la + do + if [ -f ${LA} ] + then + sed -e "s:/usr/lib:${FULLPATH}:" ${LA} > ${LA}.hacked + mv ${LA}.hacked ${LA} + mv ${LA} ${FULLPATH_D} + fi + done + + #move all the libraries to version specific libdir. + for x in ${D}${LOC}/lib/*.{so,a}* ${FULLPATH_D}/../*.{so,a}* + do + [ -f ${x} ] && mv -f ${x} ${FULLPATH_D} + done + + #move Java headers to compiler-specific dir + for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h + do + [ -f ${x} ] && mv -f ${x} ${FULLPATH_D}/include/ + done + for x in gcj gnu java javax org + do + if [ -d ${D}${LOC}/include/${x} ] + then + mkdir -p ${FULLPATH_D}/include/${x} + mv -f ${D}${LOC}/include/${x}/* ${FULLPATH_D}/include/${x}/ + rm -rf ${D}${LOC}/include/${x} + fi + done + + #move libgcj.spec to compiler-specific directories + [ -f ${D}${LOC}/lib/libgcj.spec ] && \ + mv -f ${D}${LOC}/lib/libgcj.spec ${FULLPATH_D}/libgcj.spec + + #rename jar because it could clash with Kaffe's jar if this gcc is + #primary compiler (aka don't have the - extension) + cd ${D}${LOC}/bin + [ -f jar${GCC_SUFFIX} ] && mv -f jar${GCC_SUFFIX} gcj-jar${GCC_SUFFIX} + + #move to compiler-specific directories + [ -f ${D}${STDCXX_INCDIR}/cxxabi.h ] && \ + mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${FULLPATH_D}/include/ + + if build_multiple + then + #now fix the manpages + cd ${D}${LOC}/share/man/man1 + mv cpp.1 cpp${GCC_SUFFIX}.1 + mv gcov.1 gcov${GCC_SUFFIX}.1 + fi + fi + + #this one comes with binutils + if [ -f ${D}${LOC}/lib/libiberty.a ] + then + rm -f ${D}${LOC}/lib/libiberty.a + fi + + cd ${S} + if ! use build + then + cd ${S} + docinto / + dodoc ChangeLog LAST_UPDATED README MAINTAINERS + cd ${S}/boehm-gc + docinto boehm-gc + dodoc ChangeLog doc/{README*,barrett_diagram} + docinto boehm-gc/html + dohtml doc/*.html + cd ${S}/gcc + docinto gcc + dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS \ + README* SERVICE + cd ${S}/libf2c + docinto libf2c + dodoc ChangeLog README TODO changes.netlib disclaimer.netlib \ + permission.netlib readme.netlib + cd ${S}/libffi + docinto libffi + dodoc ChangeLog* README + cd ${S}/libiberty + docinto libiberty + dodoc ChangeLog README + cd ${S}/libobjc + docinto libobjc + dodoc ChangeLog README* THREADS* + cd ${S}/libstdc++-v3 + docinto libstdc++-v3 + dodoc ChangeLog* README + + if use java + then + cd ${S}/fastjar + docinto fastjar + dodoc AUTHORS CHANGES ChangeLog NEWS README + cd ${S}/libjava + docinto libjava + dodoc ChangeLog* HACKING NEWS README THANKS + fi + else + rm -rf ${D}/usr/share/{man,info} + fi + + # Fix ncurses b0rking + find ${D}/ -name '*curses.h' -exec rm -f {} \; +} + +pkg_postrm() { + if [ ! -L ${ROOT}/lib/cpp ] + then + ln -sf /usr/bin/cpp ${ROOT}/lib/cpp + fi + if [ ! -L ${ROOT}/usr/bin/cc ] + then + ln -sf gcc ${ROOT}/usr/bin/cc + fi + + # Fix ncurses b0rking (if r5 isn't unmerged) + find ${ROOT}/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \; +} -- cgit v1.2.3-65-gdbad