From 72aead643042d12ca8b829d553d68602e4397255 Mon Sep 17 00:00:00 2001 From: Joshua Brindle Date: Wed, 5 Mar 2003 19:46:22 +0000 Subject: fix bug #16867 --- sys-devel/gcc/ChangeLog | 10 +- sys-devel/gcc/files/digest-gcc-3.2.2-r3 | 2 + sys-devel/gcc/gcc-3.2.2-r3.ebuild | 506 ++++++++++++++++++++++++++++++++ 3 files changed, 512 insertions(+), 6 deletions(-) create mode 100644 sys-devel/gcc/files/digest-gcc-3.2.2-r3 create mode 100644 sys-devel/gcc/gcc-3.2.2-r3.ebuild (limited to 'sys-devel/gcc') diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 787427a166e2..12bd096c193a 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,14 +1,12 @@ # ChangeLog for sys-devel/gcc # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.76 2003/03/05 19:01:15 method Exp $ - -*gcc-3.2.2-r4 (05 Mar 2003) - - 05 Mar 2003; Joshua Brindle gcc-3.2.2-r4.ebuild: - replace-flags "-march=pentium4" "-march=pentium3" to fix bug #16867 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.77 2003/03/05 19:46:22 method Exp $ *gcc-3.2.2-r3 (03 Mar 2003) + 05 Mar 2003; Joshua Brindle gcc-3.2.2-r3.ebuild : + replace-flags for pentium4 for bug #16867, add optimizations for x86 only + 03 Mar 2003; Joshua Brindle gcc-3.2.2-r3.ebuild : Fixed strip-flags to allow certain known stable optimizations including: -O -O1 -O2 -Os -O3 -mcpu -march -pipe -g -freorder-blocks -fprefetch-loop-arrays diff --git a/sys-devel/gcc/files/digest-gcc-3.2.2-r3 b/sys-devel/gcc/files/digest-gcc-3.2.2-r3 new file mode 100644 index 000000000000..cb247aa4b1d0 --- /dev/null +++ b/sys-devel/gcc/files/digest-gcc-3.2.2-r3 @@ -0,0 +1,2 @@ +MD5 962a2057a2572226bc99aaeba4255e9b gcc-3.2.2.tar.bz2 20311217 +MD5 74f9a0e9572b2ad94aebfc2540f93c39 gcc-3.2.2-tls-update.patch.bz2 603111 diff --git a/sys-devel/gcc/gcc-3.2.2-r3.ebuild b/sys-devel/gcc/gcc-3.2.2-r3.ebuild new file mode 100644 index 000000000000..e96763a832fd --- /dev/null +++ b/sys-devel/gcc/gcc-3.2.2-r3.ebuild @@ -0,0 +1,506 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2-r3.ebuild,v 1.3 2003/03/05 19:46:22 method Exp $ + +IUSE="static nls bootstrap java build" + +inherit eutils flag-o-matic libtool + +# Compile problems with these (bug #6641 among others)... +# We don't need these since we strip-flags below -- Joshua +#filter-flags "-fno-exceptions -fomit-frame-pointer" + +# 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 , 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. +# +# (13 Oct 2002) + +# We allow known good gcc optimizations now (only for x86) +# Joshua Brindle (04 Mar 2003) +if [ "${ARCH}" = "x86" ]; then + ALLOWED_FLAGS="-O -O1 -O2 -Os -O3 -mcpu -march -pipe -g -freorder-blocks -fprefetch-loop-arrays" + #Bug #16867, -march=pentium4 does not work, we'll replace it with -march=pentium3 + replace-flags "-march=pentium4" "-march=pentium3" +fi + +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/\.*/}" + +# Patch tarball support ... +#PATCH_VER="1.0" +PATCH_VER="" + +# Snapshot support ... +#SNAPSHOT="2002-08-12" +SNAPSHOT="" + +# Branch update support ... +MAIN_BRANCH="${PV}" # Tarball, etc used ... +#BRANCH_UPDATE="20021208" +BRANCH_UPDATE="" + +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 +#SRC_URI="${SRC_URI} mirror://gentoo/${P}-manpages.tar.bz2" +SRC_URI="${SRC_URI} mirror://gentoo/${P}-tls-update.patch.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 ~ppc ~sparc ~alpha ~hppa ~arm ~mips" + +# 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 + SLOT="${MY_PV}" +else + SLOT="${CCHOST}-${MY_PV}" +fi + +DEPEND="virtual/glibc + mips? >=sys-devel/binutils-2.13.90.0.16 : >=sys-devel/binutils-2.13.90.0.18 + >=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" + + +# Hack used to patch Makefiles to install into the build dir +FAKE_ROOT="" + +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 + + 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 + epatch ${WORKDIR}/patch + fi + + # Update to support TLS and __thread + epatch ${DISTDIR}/${P}-tls-update.patch.bz2 + + # Patches from Redhat ... +# epatch ${FILESDIR}/3.2.1/gcc32-ada-make.patch +# epatch ${FILESDIR}/3.2.1/gcc32-shared-pthread.patch + use sparc && epatch ${FILESDIR}/3.2.1/gcc32-sparc32-hack.patch + + # Patches from Mandrake/Suse ... + epatch ${FILESDIR}/3.2.1/gcc31-loop-load-final-value.patch + epatch ${FILESDIR}/3.2.1/gcc32-pr8213.patch + epatch ${FILESDIR}/3.2.1/gcc32-strip-dotdot.patch + epatch ${FILESDIR}/3.2.1/gcc32-athlon-alignment.patch + + # Patches from debian-arm + if [ "${ARCH}" = "arm" ]; then + epatch ${FILESDIR}/3.2.1/gcc32-arm-disable-mathf.patch + epatch ${FILESDIR}/3.2.1/gcc32-arm-reload1-fix.patch + 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 + + # 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. + einfo "Fixing Makefiles..." + cd ${S} + for x in $(find . -name Makefile.in) + do + # Fix --datadir= + cp ${x} ${x}.orig + sed -e 's:datadir = @datadir@:datadir = $(FAKE_ROOT)@datadir@:' \ + ${x}.orig > ${x} + + # Fix --bindir= + cp ${x} ${x}.orig + sed -e 's:bindir = @bindir@:bindir = $(FAKE_ROOT)@bindir@:' \ + ${x}.orig > ${x} + + # Fix --includedir= + cp ${x} ${x}.orig + sed -e 's:includedir = @includedir@:includedir = $(FAKE_ROOT)@includedir@:' \ + ${x}.orig > ${x} + + # Fix --with-gxx-include-dir= + cp ${x} ${x}.orig + sed -e 's:gxx_include_dir = @gxx_:gxx_include_dir = $(FAKE_ROOT)@gxx_:' \ + -e 's:glibcppinstalldir = @gxx_:glibcppinstalldir = $(FAKE_ROOT)@gxx_:' \ + ${x}.orig > ${x} + + # Where java security stuff should be installed + cp ${x} ${x}.orig + sed -e 's:secdir = $(libdir)/security:secdir = $(FAKE_ROOT)$(LIBPATH)/security:' \ + ${x}.orig > ${x} + + rm -f ${x}.orig + done + + # This next bit is for updating libtool linker scripts ... + OLD_GCC_VERSION="`gcc -dumpversion`" + + if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ] + then + echo "${OLD_GCC_VERSION}" > ${WORKDIR}/.oldgccversion + fi +} + +src_compile() { + local myconf="" + local gcc_lang="" + + if [ -z "`use build`" ] + then + myconf="${myconf} --enable-shared" + gcc_lang="c,c++,ada,f77,objc" + else + gcc_lang="c" + fi + if [ -z "`use nls`" ] || [ "`use build`" ] + then + myconf="${myconf} --disable-nls" + else + myconf="${myconf} --enable-nls --without-included-gettext" + fi + if [ -n "`use java`" ] && [ -z "`use build`" ] + then + gcc_lang="${gcc_lang},java" + fi + + # In general gcc does not like optimization, and add -O2 where + # it is safe. + # These aren't needed since we strip-flags above -- Joshua + #export CFLAGS="${CFLAGS//-O?}" + #export CXXFLAGS="${CXXFLAGS//-O?}" + + # 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..." + if [ -z "`use static`" ] + then + # Fix for our libtool-portage.patch +eerror "${CFLAGS}" + S="${WORKDIR}/build" \ + emake bootstrap-lean \ + LIBPATH="${LIBPATH}" \ + BOOT_CFLAGS="${CFLAGS}" \ + STAGE1_CFLAGS="-O" || die + + # Above FLAGS optimize and speedup build, thanks + # to Jeff Garzik + else + S="${WORKDIR}/build" \ + emake LDFLAGS=-static bootstrap \ + 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=${D}${LOC} \ + bindir=${D}${BINPATH} \ + includedir=${D}${LIBPATH}/include \ + datadir=${D}${DATAPATH} \ + mandir=${D}${DATAPATH}/man \ + infodir=${D}${DATAPATH}/info \ + LIBPATH="${LIBPATH}" \ + FAKE_ROOT="${D}" \ + 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} + + # Install wrappers +# Handled by gcc-config now ... +# exeinto /lib +# doexe ${FILESDIR}/cpp +# exeinto /usr/bin +# doexe ${FILESDIR}/cc + + # 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} ] && 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 + + # 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 - extension) + cd ${D}${LOC}/${CCHOST}/gcc-bin/${MY_PV} + [ -f jar ] && mv -f jar gcj-jar + + # Move 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} + rm -f ${CCHOST}-{gcc,g++,c++,g77} + [ -f gcc ] && ln -sf gcc ${CCHOST}-gcc + [ -f g++ ] && ln -sf g++ ${CCHOST}-g++ + [ -f g++ ] && ln -sf g++ ${CCHOST}-c++ + [ -f g77 ] && ln -sf g77 ${CCHOST}-g77 + 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 GNATS 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 + else + rm -rf ${D}/usr/share/{man,info} + fi + + # Fix ncurses b0rking + find ${D}/ -name '*curses.h' -exec rm -f {} \; +} + +pkg_postinst() { + + 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 [ -f ${WORKDIR}/.oldgccversion -a "${ROOT}" = "/" ] + then + OLD_GCC_VERSION="`cat ${WORKDIR}/.oldgccversion`" + + cp -f ${FILESDIR}/fix_libtool_files.sh ${T} + chmod +x ${T}/fix_libtool_files.sh + ${T}/fix_libtool_files.sh ${OLD_GCC_VERSION} + 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