diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-06-07 23:37:08 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-06-07 23:37:08 +0000 |
commit | 6b69cab5e741b72f2464935d8c1b1c4e2b2d93b1 (patch) | |
tree | acf338d40a96a646248efe3a3955adcf96fb40eb /sys-devel | |
parent | Updated HOMEPAGE. (diff) | |
download | historical-6b69cab5e741b72f2464935d8c1b1c4e2b2d93b1.tar.gz historical-6b69cab5e741b72f2464935d8c1b1c4e2b2d93b1.tar.bz2 historical-6b69cab5e741b72f2464935d8c1b1c4e2b2d93b1.zip |
cleanup 3.3.1
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/gcc/Manifest | 14 | ||||
-rw-r--r-- | sys-devel/gcc/files/digest-gcc-3.3.1-r1 | 5 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.1.1-r1.ebuild | 4 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.1-r1.ebuild | 578 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.1-r5.ebuild | 64 |
5 files changed, 39 insertions, 626 deletions
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 297d33077e92..2ac72a01b780 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -3,15 +3,14 @@ Hash: SHA1 MD5 86661ba0ca338a2783dd95296df291f3 ChangeLog 55289 MD5 142c4f0f1b36b7e57a99103c618ea5d9 gcc-2.95.3-r8.ebuild 9107 -MD5 b6a375116a668edbe10b2ac2e1f9fc6d gcc-3.0.4-r6.ebuild 8577 +MD5 8ba3ef9809d3cee777b3f2c995bdb742 gcc-3.0.4-r6.ebuild 8469 MD5 3a2e4f5d5f2d94e5ee2a399ab3b0f32e gcc-3.3-r1.ebuild 16506 -MD5 68da62e17a31058a92822721b553eca9 gcc-3.1.1-r1.ebuild 9424 +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 MD5 b2c168723aee82080bc1ee741848ef40 gcc-3.3.3-r4.ebuild 25550 -MD5 3c0d91ac99e191e0098f14b83f28ed44 gcc-3.3.1-r1.ebuild 16128 -MD5 bd281971d3658dd49f02f647b97c4eeb gcc-3.3.1-r5.ebuild 18002 +MD5 3946c865f2dcfa3b039b507895a47d64 gcc-3.3.1-r5.ebuild 17725 MD5 e6ead3ed008a1fe7adc73ddae996ade3 gcc-3.3.2-r1.ebuild 17965 MD5 2091041850f831fdef34656fc3308604 gcc-3.3.2-r2.ebuild 18118 MD5 6953c04e837c49f5f9e5f558fbbf8fbe gcc-3.3.2-r3.ebuild 20487 @@ -41,7 +40,6 @@ MD5 3fd5a29d44b89f4fb220fccaa968fc05 files/digest-gcc-3.3.3-r6 442 MD5 8f56750ce25ca30ffebcbdb65de95a1f files/digest-gcc-3.3.3_pre20040426 138 MD5 f57a9900e4d0edcae7b1e327e263d2f7 files/digest-gcc-3.3 294 MD5 12d4b0c4fc49fad52850ab007c3c7371 files/digest-gcc-3.3-r1 353 -MD5 c850f6ba5703712442b90b2c00060a15 files/digest-gcc-3.3.1-r1 361 MD5 d192284727acd002cf658d4c559c2d39 files/digest-gcc-3.3.1-r5 361 MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130 MD5 0d86971219ddd6dcb86f032bc2b93691 files/digest-gcc-3.3.2-r1 361 @@ -157,7 +155,7 @@ MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/reiser4-why-do-you-hate-me.patc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.8 (GNU/Linux) -iD8DBQFAxPgZHTu7gpaalycRArqzAKCYqMw2ZxMR53xRSlBn3xwyZRXuxwCg8UnD -I0itDN1/neTcb8Zcz8J3FE4= -=IEwg +iD8DBQFAxPwuHTu7gpaalycRAkFdAKCy+gndVUp9+b9eg6HZRCdpRPr6jwCg8es3 +IggGoNn2BFZgLAEYtF70zeE= +=GSDh -----END PGP SIGNATURE----- diff --git a/sys-devel/gcc/files/digest-gcc-3.3.1-r1 b/sys-devel/gcc/files/digest-gcc-3.3.1-r1 deleted file mode 100644 index 698a7d94d3de..000000000000 --- a/sys-devel/gcc/files/digest-gcc-3.3.1-r1 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 1135a104e9fa36fdf7c663598fab5c40 gcc-3.3.1.tar.bz2 23544362 -MD5 4f3e15857319734f2d732282d9ee128a gcc-3.3.1-patches-1.1.tar.bz2 25178 -MD5 b05beb163af8d43c44d271ae0301af5d gcc-3.3.1-branch-update-20030904.patch.bz2 191502 -MD5 114581fc4737a0a866a199243ba31809 protector-3.3-3.tar.gz 24428 -MD5 d8fc7feef6e2217dc640822c7283c6f4 gcc-3.3.1-manpages.tar.bz2 136818 diff --git a/sys-devel/gcc/gcc-3.1.1-r1.ebuild b/sys-devel/gcc/gcc-3.1.1-r1.ebuild index 6f74926eb0a3..4d84e9ca99e7 100644 --- a/sys-devel/gcc/gcc-3.1.1-r1.ebuild +++ b/sys-devel/gcc/gcc-3.1.1-r1.ebuild @@ -1,6 +1,6 @@ # 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.15 2004/06/07 23:29:10 vapier Exp $ +# $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. @@ -53,7 +53,7 @@ build_multiple() { # # 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 && \ + if ! use build && ! use bootstrap && \ [ "`gcc -dumpversion | cut -d. -f1,2`" != "${MY_PV}" ] && \ [ "${profile/gcc3}" = "${profile}" ] && \ [ "${GCCBUILD}" != "default" ] diff --git a/sys-devel/gcc/gcc-3.3.1-r1.ebuild b/sys-devel/gcc/gcc-3.3.1-r1.ebuild deleted file mode 100644 index a2a852e2e716..000000000000 --- a/sys-devel/gcc/gcc-3.3.1-r1.ebuild +++ /dev/null @@ -1,578 +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.3.1-r1.ebuild,v 1.10 2004/02/26 20:36:49 pappy Exp $ - -IUSE="static nls bootstrap java build X" - -inherit eutils flag-o-matic libtool - -# Compile problems with these (bug #6641 among others)... -#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr" - -# Recently there has been a lot of stability problem in Gentoo-land. Many -# things can be the cause to this, but I believe that it is due to gcc3 -# still having issues with optimizations, or with it not filtering bad -# combinations (protecting the user maybe from himeself) yet. -# -# This can clearly be seen in large builds like glibc, where too aggressive -# CFLAGS cause the tests to fail miserbly. -# -# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion -# knows what he is talking about: -# -# People really shouldn't force code-specific options on... It's a -# bad idea. The -march options aren't just to look pretty. They enable -# options that are sensible (and include sse,mmx,3dnow when apropriate). -# -# The next command strips CFLAGS and CXXFLAGS from nearly all flags. If -# you do not like it, comment it, but do not bugreport if you run into -# problems. -# -# <azarah@gentoo.org> (13 Oct 2002) -strip-flags - -# Theoretical cross compiler support -[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}" - -LOC="/usr" -MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" -MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" -# Dont install in /usr/include/g++-v3/, but in gcc internal directory. -# We will handle /usr/include/g++-v3/ with gcc-config ... -STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}" - -# ProPolice version -PP_VER="3_3" -PP_FVER="${PP_VER//_/.}-3" - -# Patch tarball support ... -#PATCH_VER="1.0" -PATCH_VER="1.1" - -# Snapshot support ... -#SNAPSHOT="2002-08-12" -SNAPSHOT= - -# Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... - -#BRANCH_UPDATE="20021208" -BRANCH_UPDATE="20030904" - -if [ -z "${SNAPSHOT}" ] -then - S="${WORKDIR}/${PN}-${MAIN_BRANCH}" - SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2" - - if [ -n "${PATCH_VER}" ] - then - SRC_URI="${SRC_URI} - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" - fi - - if [ -n "${BRANCH_UPDATE}" ] - then - SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" - fi -else - S="${WORKDIR}/gcc-${SNAPSHOT//-}" - SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2" -fi -if [ -n "${PP_VER}" ] -then - SRC_URI="${SRC_URI} - http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz" -fi -SRC_URI="${SRC_URI} - mirror://gentoo/${P}-manpages.tar.bz2" - -DESCRIPTION="The GNU Compiler Collection. Includes C/C++ and java compilers" -HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" - -LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="-* ~x86 amd64 ia64" - -# Ok, this is a hairy one again, but lets assume that we -# are not cross compiling, than we want SLOT to only contain -# $PV, as people upgrading to new gcc layout will not have -# their old gcc unmerged ... -if [ "${CHOST}" == "${CCHOST}" ] -then -# GCC-3.3 is supposed to be binary compatible with 3.2.. -# SLOT="${MY_PV}" - SLOT="3.2" -else -# GCC-3.3 is supposed to be binary compatible with 3.2.. -# SLOT="${CCHOST}-${MY_PV}" - SLOT="${CCHOST}-3.2" -fi - -# We need the later binutils for support of the new cleanup attribute. -# 'make check' fails for about 10 tests (if I remember correctly) less -# if we use later bison. -DEPEND="virtual/glibc - >=sys-devel/binutils-2.14.90.0.6-r1 - >=sys-devel/bison-1.875 - >=sys-devel/gcc-config-1.3.1 - !build? ( >=sys-libs/ncurses-5.2-r2 - nls? ( sys-devel/gettext ) )" - -RDEPEND="virtual/glibc - >=sys-devel/gcc-config-1.3.1 - >=sys-libs/zlib-1.1.4 - >=sys-apps/texinfo-4.2-r4 - !build? ( >=sys-libs/ncurses-5.2-r2 )" - -PDEPEND="sys-devel/gcc-config" - - -chk_gcc_version() { - # This next bit is for updating libtool linker scripts ... - local OLD_GCC_VERSION="`gcc -dumpversion`" - local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\ - sed -e 's:^.*/gcc-lib/\([^/]*\)/[0-9]\+.*$:\1:')" - - if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ] - then - echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" - fi - - if [ -n "${OLD_GCC_CHOST}" ] - then - if [ "${CHOST}" = "${CCHOST}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ] - then - echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost" - fi - fi - - # Did we check the version ? - touch "${WORKDIR}/.chkgccversion" -} - -version_patch() { - [ ! -f "$1" ] && return 1 - [ -z "$2" ] && return 1 - - sed -e "s:@GENTOO@:$2:g" ${1} > ${T}/${1##*/} - epatch ${T}/${1##*/} -} - -src_unpack() { - if [ -z "${SNAPSHOT}" ] - then - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 - - if [ -n "${PATCH_VER}" ] - then - unpack ${P}-patches-${PATCH_VER}.tar.bz2 - fi - else - unpack gcc-${SNAPSHOT//-}.tar.bz2 - fi - - if [ -n "${PP_VER}" ] - then - unpack protector-${PP_FVER}.tar.gz - fi - - cd ${S} - # Fixup libtool to correctly generate .la files with portage - elibtoolize --portage --shallow - - echo - - # Branch update ... - if [ -n "${BRANCH_UPDATE}" ] - then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 - fi - - # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 - if [ -n "${PATCH_VER}" ] - then - # Exclude this as it is fixed in apps according to lu_zero. - mkdir -p ${WORKDIR}/exclude - mv -f ${WORKDIR}/patch/08* ${WORKDIR}/exclude/ - - epatch ${WORKDIR}/patch - fi - - if [ -z "${PP_VER}" ] - then - # Make gcc's version info specific to Gentoo - version_patch ${FILESDIR}/3.3.1/gcc331-gentoo-branding.patch \ - "${BRANCH_UPDATE} (Gentoo Linux ${PVR})" || die "Failed Branding" - fi - - if [ -n "${PP_VER}" ] && [ "${ARCH}" != "hppa" ] - then - # ProPolice Stack Smashing protection - epatch ${WORKDIR}/protector.dif - cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found" - cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found" - version_patch ${FILESDIR}/3.3.1/gcc331-gentoo-branding.patch \ - "${BRANCH_UPDATE} (Gentoo Linux ${PVR}, propolice)" \ - || die "Failed Branding" - fi - - # Install our pre generated manpages if we do not have perl ... - if [ ! -x /usr/bin/perl ] - then - cd ${S}; unpack ${P}-manpages.tar.bz2 - fi - - # Misdesign in libstdc++ (Redhat) - cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h - - cd ${S}; ./contrib/gcc_update --touch &> /dev/null -} - -src_compile() { - - local myconf= - local gcc_lang= - - if [ -z "`use build`" ] - then - myconf="${myconf} --enable-shared" - gcc_lang="c,c++,f77,objc" - else - gcc_lang="c" - fi - if [ -z "`use nls`" -o "`use build`" ] - then - myconf="${myconf} --disable-nls" - else - myconf="${myconf} --enable-nls --without-included-gettext" - fi - if [ -n "`use java`" -a -z "`use build`" ] - then - gcc_lang="${gcc_lang},java" - fi - - # Enable building of the gcj Java AWT & Swing X11 backend - # if we have X as a use flag and are not in a build stage. - # X11 support is still very experimental but enabling it is - # quite innocuous... [No, gcc is *not* linked to X11...] - # <dragon@gentoo.org> (15 May 2003) - if [ -n "`use java`" -a -n "`use X`" -a -z "`use build`" -a \ - -f /usr/X11R6/include/X11/Xlib.h ] - then - myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib" - myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x" - fi - - # Multilib not yet supported - myconf="${myconf} --disable-multilib" - - # In general gcc does not like optimization, and add -O2 where - # it is safe. This is especially true for gcc-3.3 ... - export CFLAGS="${CFLAGS/-O?/-O2}" - export CXXFLAGS="${CXXFLAGS/-O?/-O2}" - export GCJFLAGS="${CFLAGS/-O?/-O2}" - - # Build in a separate build tree - mkdir -p ${WORKDIR}/build - cd ${WORKDIR}/build - - einfo "Configuring GCC..." - addwrite "/dev/zero" - ${S}/configure --prefix=${LOC} \ - --bindir=${BINPATH} \ - --includedir=${LIBPATH}/include \ - --datadir=${DATAPATH} \ - --mandir=${DATAPATH}/man \ - --infodir=${DATAPATH}/info \ - --enable-shared \ - --host=${CHOST} \ - --target=${CCHOST} \ - --with-system-zlib \ - --enable-languages=${gcc_lang} \ - --enable-threads=posix \ - --enable-long-long \ - --disable-checking \ - --enable-cstdio=stdio \ - --enable-clocale=generic \ - --enable-__cxa_atexit \ - --enable-version-specific-runtime-libs \ - --with-gxx-include-dir=${STDCXX_INCDIR} \ - --with-local-prefix=${LOC}/local \ - ${myconf} || die - - touch ${S}/gcc/c-gperf.h - - # Do not make manpages if we do not have perl ... - if [ ! -x /usr/bin/perl ] - then - find ${S} -name '*.[17]' -exec touch {} \; || : - fi - - # Setup -j in MAKEOPTS - get_number_of_jobs - - einfo "Building GCC..." - # Only build it static if we are just building the C frontend, else - # a lot of things break because there are not libstdc++.so .... - if [ -n "`use static`" -a "${gcc_lang}" = "c" ] - then - # Fix for our libtool-portage.patch - S="${WORKDIR}/build" \ - emake LDFLAGS="-static" bootstrap \ - LIBPATH="${LIBPATH}" \ - BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die - # Above FLAGS optimize and speedup build, thanks - # to Jeff Garzik <jgarzik@mandrakesoft.com> - else - # Fix for our libtool-portage.patch - S="${WORKDIR}/build" \ - emake bootstrap-lean \ - LIBPATH="${LIBPATH}" \ - BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die - - fi -} - -src_install() { - # Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as - # this can break the build. - for x in cd ${WORKDIR}/build/gcc/include/* - do - if [ -L ${x} ] - then - rm -f ${x} - fi - done - - einfo "Installing GCC..." - # Do the 'make install' from the build directory - cd ${WORKDIR}/build - S="${WORKDIR}/build" \ - make prefix=${LOC} \ - bindir=${BINPATH} \ - includedir=${LIBPATH}/include \ - datadir=${DATAPATH} \ - mandir=${DATAPATH}/man \ - infodir=${DATAPATH}/info \ - DESTDIR="${D}" \ - LIBPATH="${LIBPATH}" \ - install || die - - [ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}" - - dodir /lib /usr/bin - dodir /etc/env.d/gcc - echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - # Also set CC and CXX - echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - - - # Make sure we dont have stuff lying around that - # can nuke multiple versions of gcc - if [ -z "`use build`" ] - then - cd ${D}${LIBPATH} - - # Tell libtool files where real libraries are - for LA in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la - do - if [ -f ${LA} ] - then - sed -e "s:/usr/lib:${LIBPATH}:" ${LA} > ${LA}.hacked - mv ${LA}.hacked ${LA} - mv ${LA} ${D}${LIBPATH} - fi - done - - # Move all the libraries to version specific libdir. - for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}* - do - [ -f ${x} -o -L ${x} ] && mv -f ${x} ${D}${LIBPATH} - 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} ${D}${LIBPATH}/include/ - done - for x in gcj gnu java javax org - do - if [ -d ${D}${LOC}/include/${x} ] - then - dodir /${LIBPATH}/include/${x} - mv -f ${D}${LOC}/include/${x}/* ${D}${LIBPATH}/include/${x}/ - rm -rf ${D}${LOC}/include/${x} - fi - done - - if [ -d ${D}${LOC}/lib/security ] - then - dodir /${LIBPATH}/security - mv -f ${D}${LOC}/lib/security/* ${D}${LIBPATH}/security - rm -rf ${D}${LOC}/lib/security - fi - - # Move libgcj.spec to compiler-specific directories - [ -f ${D}${LOC}/lib/libgcj.spec ] && \ - mv -f ${D}${LOC}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec - - # Rename jar because it could clash with Kaffe's jar if this gcc is - # primary compiler (aka don't have the -<version> extension) - cd ${D}${LOC}/${CCHOST}/gcc-bin/${MY_PV} - [ -f jar ] && mv -f jar gcj-jar - - # 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 - cd ${D}${BINPATH} - for x in gcc g++ c++ g77 gcj - do - rm -f ${CCHOST}-${x} - [ -f ${x} ] && ln -sf ${x} ${CCHOST}-${x} - - if [ -f ${CCHOST}-${x}-${PV} ] - then - rm -f ${CCHOST}-${x}-${PV} - ln -sf ${x} ${CCHOST}-${x}-${PV} - fi - done - 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 [ -z "`use build`" ] - then - cd ${S} - docinto /${CCHOST} - dodoc COPYING COPYING.LIB ChangeLog* FAQ MAINTAINERS README - docinto ${CCHOST}/html - dohtml *.html - cd ${S}/boehm-gc - docinto ${CCHOST}/boehm-gc - dodoc ChangeLog doc/{README*,barrett_diagram} - docinto ${CCHOST}/boehm-gc/html - dohtml doc/*.html - cd ${S}/gcc - docinto ${CCHOST}/gcc - dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE - cd ${S}/libf2c - docinto ${CCHOST}/libf2c - dodoc ChangeLog* README TODO *.netlib - cd ${S}/libffi - docinto ${CCHOST}/libffi - dodoc ChangeLog* LICENSE README - cd ${S}/libiberty - docinto ${CCHOST}/libiberty - dodoc ChangeLog* COPYING.LIB README - cd ${S}/libobjc - docinto ${CCHOST}/libobjc - dodoc ChangeLog* README* THREADS* - cd ${S}/libstdc++-v3 - docinto ${CCHOST}/libstdc++-v3 - dodoc ChangeLog* README - docinto ${CCHOST}/libstdc++-v3/html - dohtml -r -a css,diff,html,txt,xml docs/html/* - cp -f docs/html/17_intro/[A-Z]* \ - ${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/ - - if [ -n "`use java`" ] - then - cd ${S}/fastjar - docinto ${CCHOST}/fastjar - dodoc AUTHORS CHANGES COPYING ChangeLog* NEWS README - cd ${S}/libjava - docinto ${CCHOST}/libjava - dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS - fi - - prepman ${DATAPATH} - prepinfo ${DATAPATH} - else - rm -rf ${D}/usr/share/{man,info} - rm -rf ${D}${DATAPATH}/{man,info} - fi - - # Rather install the script, else portage with changing $FILESDIR - # between binary and source package borks things .... - insinto /lib/rcscripts/awk - doins ${FILESDIR}/awk/fixlafiles.awk - exeinto /sbin - doexe ${FILESDIR}/fix_libtool_files.sh - - # Fix ncurses b0rking - find ${D}/ -name '*curses.h' -exec rm -f {} \; -} - -pkg_preinst() { - - if [ ! -f "${WORKDIR}/.chkgccversion" ] - then - chk_gcc_version - fi - - # Make again sure that the linker "should" be able to locate - # libstdc++.so ... - export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}" - ${ROOT}/sbin/ldconfig -} - -pkg_postinst() { - - export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}" - - if [ "${ROOT}" = "/" -a "${COMPILER}" = "gcc3" -a "${CHOST}" = "${CCHOST}" ] - then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} - fi - - # Update libtool linker scripts to reference new gcc version ... - if [ "${ROOT}" = "/" ] && \ - [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ] - then - local OLD_GCC_VERSION= - local OLD_GCC_CHOST= - - if [ -f "${WORKDIR}/.oldgccversion" ] && \ - [ -n "$(cat "${WORKDIR}/.oldgccversion")" ] - then - OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" - else - OLD_GCC_VERSION="${MY_PV_FULL}" - fi - - if [ -f "${WORKDIR}/.oldgccchost" ] && \ - [ -n "$(cat "${WORKDIR}/.oldgccchost")" ] - then - OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")" - fi - - /sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST} - fi - - # Fix ncurses b0rking (if r5 isn't unmerged) - find ${ROOT}/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \; - - # http://dev.gentoo.org/~pappy/hardened-gcc/docs/etdyn-ssp.html - if has_version '>=sys-devel/hardened-gcc-1.2' - then - [ "${ROOT}" = "/" ] && hardened-gcc -A - fi -} - diff --git a/sys-devel/gcc/gcc-3.3.1-r5.ebuild b/sys-devel/gcc/gcc-3.3.1-r5.ebuild index ccad3db15cc7..f8c422d41e03 100644 --- a/sys-devel/gcc/gcc-3.3.1-r5.ebuild +++ b/sys-devel/gcc/gcc-3.3.1-r5.ebuild @@ -1,14 +1,9 @@ # 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.3.1-r5.ebuild,v 1.6 2004/01/08 19:53:24 agriffis Exp $ - -IUSE="static nls bootstrap java build X multilib" +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.1-r5.ebuild,v 1.7 2004/06/07 23:37:08 vapier Exp $ inherit eutils flag-o-matic libtool -# Compile problems with these (bug #6641 among others)... -#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr" - # Recently there has been a lot of stability problem in Gentoo-land. Many # things can be the cause to this, but I believe that it is due to gcc3 # still having issues with optimizations, or with it not filtering bad @@ -29,7 +24,13 @@ inherit eutils flag-o-matic libtool # problems. # # <azarah@gentoo.org> (13 Oct 2002) -strip-flags +do_filter_flags() { + strip-flags + + # In general gcc does not like optimization, and add -O2 where + # it is safe. + filter-flags -O? +} # Theoretical cross compiler support [ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}" @@ -95,7 +96,8 @@ DESCRIPTION="The GNU Compiler Collection. Includes C/C++ and java compilers" HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="-* ~x86 ~mips ~sparc amd64 ~ia64" +KEYWORDS="-* ~x86 ~mips ~sparc amd64 ia64" +IUSE="static nls bootstrap java build X multilib" # Ok, this is a hairy one again, but lets assume that we # are not cross compiling, than we want SLOT to only contain @@ -199,14 +201,14 @@ src_unpack() { mkdir -p ${WORKDIR}/patch/exclude # Exclude this as it is fixed in apps according to lu_zero. mv -f ${WORKDIR}/patch/3* ${WORKDIR}/patch/exclude/ - if [ -n "`use multilib`" -a "$ARCH" = "amd64" ] + if use multilib && [ "$ARCH" = "amd64" ] then mv -f ${WORKDIR}/patch/06* ${WORKDIR}/patch/exclude/ fi epatch ${WORKDIR}/patch fi - if [ -n "`use multilib`" -a "$ARCH" = "amd64" ] + if use multilib && [ "$ARCH" = "amd64" ] then epatch ${FILESDIR}/gcc331_use_multilib.amd64.patch fi @@ -245,24 +247,23 @@ src_unpack() { } src_compile() { - local myconf= local gcc_lang= - if [ -z "`use build`" ] + if ! use build then myconf="${myconf} --enable-shared" gcc_lang="c,c++,f77,objc" else gcc_lang="c" fi - if [ -z "`use nls`" -o "`use build`" ] + if ! use nls || use build then myconf="${myconf} --disable-nls" else myconf="${myconf} --enable-nls --without-included-gettext" fi - if [ -n "`use java`" -a -z "`use build`" ] + if use java && ! use build then gcc_lang="${gcc_lang},java" fi @@ -272,15 +273,14 @@ src_compile() { # X11 support is still very experimental but enabling it is # quite innocuous... [No, gcc is *not* linked to X11...] # <dragon@gentoo.org> (15 May 2003) - if [ -n "`use java`" -a -n "`use X`" -a -z "`use build`" -a \ - -f /usr/X11R6/include/X11/Xlib.h ] + if use java && use X && ! use build && -f /usr/X11R6/include/X11/Xlib.h then myconf="${myconf} --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib" myconf="${myconf} --enable-interpreter --enable-java-awt=xlib --with-x" fi # Multilib not yet supported - if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ] + if use multilib && [ "${ARCH}" = "amd64" ] then einfo "WARNING: Multilib support enabled. This is still experimental." myconf="${myconf} --enable-multilib" @@ -294,8 +294,7 @@ src_compile() { # In general gcc does not like optimization, and add -O2 where # it is safe. This is especially true for gcc-3.3 ... - export CFLAGS="${CFLAGS/-O?/-O2}" - export CXXFLAGS="${CXXFLAGS/-O?/-O2}" + do_filter_flags export GCJFLAGS="${CFLAGS/-O?/-O2}" # Build in a separate build tree @@ -340,7 +339,7 @@ src_compile() { einfo "Building GCC..." # Only build it static if we are just building the C frontend, else # a lot of things break because there are not libstdc++.so .... - if [ -n "`use static`" -a "${gcc_lang}" = "c" ] + if use static && [ "${gcc_lang}" = "c" ] then # Fix for our libtool-portage.patch S="${WORKDIR}/build" \ @@ -390,7 +389,7 @@ src_install() { dodir /etc/env.d/gcc echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ] + if use multilib && [ "${ARCH}" = "amd64" ] then # amd64 is a bit unique because of multilib. Add some other paths echo "LDPATH=\"${LIBPATH}:${LIBPATH}/32:${LIBPATH}/../lib64:${LIBPATH}/../lib32\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} @@ -406,7 +405,7 @@ src_install() { # Make sure we dont have stuff lying around that # can nuke multiple versions of gcc - if [ -z "`use build`" ] + if ! use build then cd ${D}${LIBPATH} @@ -483,11 +482,11 @@ src_install() { fi cd ${S} - if [ -z "`use build`" ] + if ! use build then cd ${S} docinto /${CCHOST} - dodoc COPYING COPYING.LIB ChangeLog* FAQ MAINTAINERS README + dodoc ChangeLog* FAQ MAINTAINERS README docinto ${CCHOST}/html dohtml *.html cd ${S}/boehm-gc @@ -503,10 +502,10 @@ src_install() { dodoc ChangeLog* README TODO *.netlib cd ${S}/libffi docinto ${CCHOST}/libffi - dodoc ChangeLog* LICENSE README + dodoc ChangeLog* README cd ${S}/libiberty docinto ${CCHOST}/libiberty - dodoc ChangeLog* COPYING.LIB README + dodoc ChangeLog* README cd ${S}/libobjc docinto ${CCHOST}/libobjc dodoc ChangeLog* README* THREADS* @@ -518,14 +517,14 @@ src_install() { cp -f docs/html/17_intro/[A-Z]* \ ${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/ - if [ -n "`use java`" ] + if use java then cd ${S}/fastjar docinto ${CCHOST}/fastjar - dodoc AUTHORS CHANGES COPYING ChangeLog* NEWS README + dodoc AUTHORS CHANGES ChangeLog* NEWS README cd ${S}/libjava docinto ${CCHOST}/libjava - dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS + dodoc ChangeLog* HACKING LIBGCJ_LICENSE NEWS README THANKS fi prepman ${DATAPATH} @@ -545,7 +544,7 @@ src_install() { # Fix ncurses b0rking find ${D}/ -name '*curses.h' -exec rm -f {} \; - if [ -n "`use multilib`" -a "$ARCH" = "amd64" ] + if use multilib && [ "$ARCH" = "amd64" ] then # If using multilib, GCC has a bug, where it doesn't know where to find # -lgcc_s when linking while compiling with g++ . ${LIBPATH} is in @@ -565,7 +564,7 @@ pkg_preinst() { # Make again sure that the linker "should" be able to locate # libstdc++.so ... - if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ] + if use multilib && [ "${ARCH}" = "amd64" ] then # Can't always find libgcc_s.so.1, make it find it export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}" @@ -576,8 +575,7 @@ pkg_preinst() { } pkg_postinst() { - - if [ -n "`use multilib`" -a "${ARCH}" = "amd64" ] + if use multilib && [ "${ARCH}" = "amd64" ] then # Can't always find libgcc_s.so.1, make it find it export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}" |