diff options
author | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-11 08:58:54 +0000 |
---|---|---|
committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-11 08:58:54 +0000 |
commit | fb4257cd4ecfe9cee0302aafa5415561de71274d (patch) | |
tree | 18692ff8ec8a6b26611e95bd1a8d9520c5db0584 /sys-devel | |
parent | Addinf glibc emul to package.mask as we get it from sys-libs/glibc now (diff) | |
download | historical-fb4257cd4ecfe9cee0302aafa5415561de71274d.tar.gz historical-fb4257cd4ecfe9cee0302aafa5415561de71274d.tar.bz2 historical-fb4257cd4ecfe9cee0302aafa5415561de71274d.zip |
Bump to a newer version of the 3.4 branch from upstream. This should resolve alot of SIMD issues people are hsving with -msse and others. Should resolve bug #57602, hopefully bug #75067, and all of its kin.
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/gcc/ChangeLog | 10 | ||||
-rw-r--r-- | sys-devel/gcc/Manifest | 36 | ||||
-rw-r--r-- | sys-devel/gcc/files/digest-gcc-3.4.3.20050110 | 7 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-2.95.3-r8.ebuild | 38 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.2.3-r4.ebuild | 58 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.2-r2.ebuild | 58 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.2-r5.ebuild | 58 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.2-r7.ebuild | 58 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.2.ebuild | 58 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.3-r3.ebuild | 58 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.3-r6.ebuild | 58 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.4-r1.ebuild | 58 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.3.4-r2.ebuild | 58 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.4.1-r3.ebuild | 56 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.4.2-r2.ebuild | 8 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.4.3.20050110.ebuild | 147 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.4.3.ebuild | 8 |
17 files changed, 498 insertions, 334 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index a2c997b416ae..d3e6e2584912 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-devel/gcc # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.367 2005/01/10 11:26:22 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.368 2005/01/11 08:58:53 eradicator Exp $ + +*gcc-3.4.3.20050110 (10 Jan 2005) + + 10 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + +gcc-3.4.3.20050110.ebuild: + Bump to a newer version of the 3.4 branch from upstream. This should resolve + alot of SIMD issues people are hsving with -msse and others. Should resolve + bug #57602, hopefully bug #75067, and all of its kin. 10 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> gcc-3.3.5-r1.ebuild, gcc-3.4.3-r1.ebuild: diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index a7e218a3ad5c..9c25680444e5 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -1,23 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 02157709ea2501691a702088d544b5ab ChangeLog 77150 -MD5 1cc192aba411ac83ab6905c2d3c1cb2d gcc-2.95.3-r8.ebuild 8432 +MD5 a65e5a627840e595d97243d21b14cace ChangeLog 77486 +MD5 197f9713e4529bbfe6ef20b7633bf437 gcc-2.95.3-r8.ebuild 8541 MD5 a19ba7542bc8429c2662cdc9fb852190 gcc-3.4.3-r1.ebuild 5364 -MD5 4ae030bd0b7fd0ef5c859b8ca2d32436 gcc-3.2.3-r4.ebuild 19729 -MD5 1fef307d644a7f84c935236c8b6be083 gcc-3.4.2-r2.ebuild 13486 +MD5 f95107278e3a6306068d0f9ef63fc5de gcc-3.2.3-r4.ebuild 19890 +MD5 126935e7dcf1585f4bbc878288a63089 gcc-3.4.2-r2.ebuild 13505 MD5 a8802bfe958c49e8393972d727b7edf2 gcc-3.3.5-r1.ebuild 3637 -MD5 b722492a21537c1ec3a15acb8f11a387 gcc-3.3.2-r2.ebuild 17859 -MD5 e8b561dbb0d86dcee9ca99b835813d92 gcc-3.3.2-r5.ebuild 21183 -MD5 32a49c379c995aa266bd40448f16480c gcc-3.3.4-r2.ebuild 24489 -MD5 778e3f9f0a84fb7e8c477880027fe39d gcc-3.3.2-r7.ebuild 21588 -MD5 3384a275321a4ed8869bfb2d740eb74b gcc-3.3.2.ebuild 16693 -MD5 9480816d969717d52d56af9da7b2df12 gcc-3.3.3-r3.ebuild 23403 -MD5 8d5444efd838da5c75c82e64e2625dfd gcc-3.4.1-r3.ebuild 31269 -MD5 521e5a311811e8eb920198e20a7c433f gcc-3.3.3-r6.ebuild 24793 -MD5 d81ef073d429d7ed3d5393ecffc4e610 gcc-3.4.3.ebuild 13254 +MD5 0232e73f034eb53c7e5e66264eed1652 gcc-3.4.1-r3.ebuild 31430 +MD5 cb258f3d644722f480d77c7eb370bd32 gcc-3.3.2-r2.ebuild 18016 +MD5 795d253a88e61dc43b4e8298c2a6c591 gcc-3.3.2-r5.ebuild 21340 +MD5 d1e3f9c0e5ec2a9171fda15b21c442da gcc-3.3.4-r2.ebuild 24646 +MD5 a8c39c6e43796403cadde63f14eb54b6 gcc-3.3.2-r7.ebuild 21745 +MD5 6ee069b74403ca14b28b51f9cf28f019 gcc-3.3.2.ebuild 16850 +MD5 6a96b668af8e1c5941b504d09cde6eb1 gcc-3.3.3-r3.ebuild 23560 +MD5 ba50078d0cd6896205fb2c8c44ef78e0 gcc-3.3.3-r6.ebuild 24950 +MD5 c7369b7fc6fdea22b109c33736bec20a gcc-3.4.3.20050110.ebuild 5376 +MD5 6c31dfdb1545539ed1ebbfa5d4a15f69 gcc-3.4.3.ebuild 13273 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -MD5 5b214acf30ab089dfd7d79f8115bbdd6 gcc-3.3.4-r1.ebuild 24684 +MD5 703a09e9045027be0c9812576ad719b1 gcc-3.3.4-r1.ebuild 24841 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64 @@ -28,6 +29,7 @@ MD5 60e02a7ee2f579ac72ab223679d81e7a files/gcc-spec-env.patch 819 MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130 MD5 a3edf5e9d8bb500178f8dd29c1f9eadd files/digest-gcc-3.3.5-r1 442 MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r2 361 +MD5 e7e6f6800c5b2e5840cf837e4bd6e1a6 files/digest-gcc-3.4.3.20050110 536 MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361 MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r2 442 MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361 @@ -116,7 +118,7 @@ MD5 97d7409ba5038bea85f9cabe023e28a6 files/3.4.1/gcc-3.4.1-spec-env.patch 755 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFB4mZqArHZZzCEUG0RAhA4AJ9tj3CABE6RYoNARFt/6kN0zRH60gCeJsVe -T7reHVmYKe3ncqH+lbQPR50= -=qPSL +iD8DBQFB45VkArHZZzCEUG0RAoAKAJ9YAc2TAW22U3zSV1PwitbTdZm5FACfSw3V +8qMXog5KIa5zDk2pNls7uzw= +=917W -----END PGP SIGNATURE----- diff --git a/sys-devel/gcc/files/digest-gcc-3.4.3.20050110 b/sys-devel/gcc/files/digest-gcc-3.4.3.20050110 new file mode 100644 index 000000000000..cf57ca5cdfbb --- /dev/null +++ b/sys-devel/gcc/files/digest-gcc-3.4.3.20050110 @@ -0,0 +1,7 @@ +MD5 e744b30c834360fccac41eb7269a3011 gcc-3.4.3.tar.bz2 27425338 +MD5 62c219356eebc464fedff69e922065ea gcc-3.4.3-branch-update-20050110.patch.bz2 737240 +MD5 43eb812f851d70b069a4e430c91f224a protector-3.4.3.20050110-0.tar.gz 32691 +MD5 7e13ac1ac8a87cc5bffee82e0436230d gcc-3.4.3-manpages.tar.bz2 264998 +MD5 3d7c6afee2e68f10c55f54ce87395876 gcc-3.4.3-patches-1.1.tar.bz2 91779 +MD5 652429381625f8637c7a8957a98676a6 gcc-3.4.3-piepatches-v8.7.7.tar.bz2 14306 +MD5 b1040fff7d8cd069347080b8ec3e87b7 bounds-checking-gcc-3.4.2-1.00.patch.bz2 815369 diff --git a/sys-devel/gcc/gcc-2.95.3-r8.ebuild b/sys-devel/gcc/gcc-2.95.3-r8.ebuild index 76682635c9f8..e1ace96f6756 100644 --- a/sys-devel/gcc/gcc-2.95.3-r8.ebuild +++ b/sys-devel/gcc/gcc-2.95.3-r8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r8.ebuild,v 1.37 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r8.ebuild,v 1.38 2005/01/11 08:58:54 eradicator Exp $ inherit eutils flag-o-matic gcc versionator fixheadtails @@ -25,14 +25,14 @@ do_filter_flags() { [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" + +LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # Dont install in /usr/include/g++/, but in gcc internal directory. # We will handle /usr/include/g++/ with gcc-config ... STDCXX_INCDIR="${LIBPATH}/include/g++" @@ -49,7 +49,7 @@ IUSE="static nls bootstrap java build" # 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 ... -SLOT="${MY_PV}" +SLOT="${GCC_BRANCH_VER}" DEPEND="virtual/libc >=sys-devel/gcc-config-1.2 @@ -207,15 +207,15 @@ src_install() { 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} + echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Install wrappers exeinto /lib @@ -301,6 +301,6 @@ src_install() { pkg_postinst() { if [ "${ROOT}" = "/" -a "${CHOST}" == "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi } diff --git a/sys-devel/gcc/gcc-3.2.3-r4.ebuild b/sys-devel/gcc/gcc-3.2.3-r4.ebuild index ab2280790932..7fd2268e57c2 100644 --- a/sys-devel/gcc/gcc-3.2.3-r4.ebuild +++ b/sys-devel/gcc/gcc-3.2.3-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.15 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.16 2005/01/11 08:58:54 eradicator Exp $ inherit eutils flag-o-matic libtool versionator @@ -36,17 +36,17 @@ do_filter_flags() { [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" + +LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # Don't 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/\.*/}" +STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}" # ProPolice version PP_VER1="3_2_2" @@ -61,15 +61,15 @@ PATCH_VER="" SNAPSHOT="" # Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... +GCC_RELEASE_VER="${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" + S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}" + SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2" if [ -n "${PATCH_VER}" ] then @@ -80,7 +80,7 @@ then if [ -n "${BRANCH_UPDATE}" ] then SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" + mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" fi else S="${WORKDIR}/gcc-${SNAPSHOT//-}" @@ -106,7 +106,7 @@ IUSE="static nls bootstrap java build" # 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 ... -SLOT="${MY_PV}" +SLOT="${GCC_BRANCH_VER}" DEPEND=">=sys-libs/glibc-2.3.2-r3 mips? ( >=sys-devel/binutils-2.13.90.0.16 ) @@ -135,7 +135,7 @@ chk_gcc_version() { 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}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -162,7 +162,7 @@ version_patch() { src_unpack() { if [ -z "${SNAPSHOT}" ] then - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 + unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2 if [ -n "${PATCH_VER}" ] then @@ -183,7 +183,7 @@ src_unpack() { # Branch update ... if [ -n "${BRANCH_UPDATE}" ] then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 + epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 fi # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 @@ -445,15 +445,15 @@ src_install() { 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} + echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Install wrappers # Handled by gcc-config now ... @@ -506,7 +506,7 @@ src_install() { # 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} + cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -609,7 +609,7 @@ pkg_postinst() { if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi # Update libtool linker scripts to reference new gcc version ... @@ -624,7 +624,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.3.2-r2.ebuild b/sys-devel/gcc/gcc-3.3.2-r2.ebuild index d92902efa3c5..39d217f73def 100644 --- a/sys-devel/gcc/gcc-3.3.2-r2.ebuild +++ b/sys-devel/gcc/gcc-3.3.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r2.ebuild,v 1.19 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r2.ebuild,v 1.20 2005/01/11 08:58:54 eradicator Exp $ IUSE="static nls bootstrap java build X multilib" @@ -35,17 +35,17 @@ strip-flags [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" + +LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # 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/\.*/}" +STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}" # ProPolice version PP_VER="3_3" @@ -60,15 +60,15 @@ PATCH_VER="1.0" SNAPSHOT= # Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... +GCC_RELEASE_VER="${PV}" # Tarball, etc used ... #BRANCH_UPDATE="20021208" BRANCH_UPDATE="20031022" if [ -z "${SNAPSHOT}" ] then - S="${WORKDIR}/${PN}-${MAIN_BRANCH}" - SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2" + S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}" + SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2" if [ -n "${PATCH_VER}" ] then @@ -79,7 +79,7 @@ then if [ -n "${BRANCH_UPDATE}" ] then SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" + mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" fi else S="${WORKDIR}/gcc-${SNAPSHOT//-}" @@ -132,7 +132,7 @@ chk_gcc_version() { 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}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -160,7 +160,7 @@ version_patch() { src_unpack() { if [ -z "${SNAPSHOT}" ] then - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 + unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2 if [ -n "${PATCH_VER}" ] then @@ -184,7 +184,7 @@ src_unpack() { # Branch update ... if [ -n "${BRANCH_UPDATE}" ] then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 + epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 fi # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 @@ -381,21 +381,21 @@ src_install() { 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 "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} 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} + echo "LDPATH=\"${LIBPATH}:${LIBPATH}/32:${LIBPATH}/../lib64:${LIBPATH}/../lib32\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} else - echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} + echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} fi - 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} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Make sure we dont have stuff lying around that # can nuke multiple versions of gcc @@ -447,7 +447,7 @@ src_install() { # 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} + cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -579,7 +579,7 @@ pkg_postinst() { fi if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi # Update libtool linker scripts to reference new gcc version ... @@ -594,7 +594,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.3.2-r5.ebuild b/sys-devel/gcc/gcc-3.3.2-r5.ebuild index d956ed60a196..119108e9a956 100644 --- a/sys-devel/gcc/gcc-3.3.2-r5.ebuild +++ b/sys-devel/gcc/gcc-3.3.2-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r5.ebuild,v 1.26 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r5.ebuild,v 1.27 2005/01/11 08:58:54 eradicator Exp $ IUSE="static nls bootstrap java build X multilib gcj" @@ -38,17 +38,17 @@ strip-flags [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" + +LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # 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/\.*/}" +STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}" # ProPolice version PP_VER="3_3" @@ -63,15 +63,15 @@ PATCH_VER="1.0" SNAPSHOT= # Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... +GCC_RELEASE_VER="${PV}" # Tarball, etc used ... #BRANCH_UPDATE="20021208" BRANCH_UPDATE="20031218" if [ -z "${SNAPSHOT}" ] then - S="${WORKDIR}/${PN}-${MAIN_BRANCH}" - SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2" + S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}" + SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2" if [ -n "${PATCH_VER}" ] then @@ -82,7 +82,7 @@ then if [ -n "${BRANCH_UPDATE}" ] then SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" + mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" fi else S="${WORKDIR}/gcc-${SNAPSHOT//-}" @@ -142,7 +142,7 @@ chk_gcc_version() { 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}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -226,7 +226,7 @@ check_glibc_ssp() { src_unpack() { if [ -z "${SNAPSHOT}" ] then - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 + unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2 if [ -n "${PATCH_VER}" ] then @@ -250,7 +250,7 @@ src_unpack() { # Branch update ... if [ -n "${BRANCH_UPDATE}" ] then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 + epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 fi # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 @@ -470,22 +470,22 @@ src_install() { 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 "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} 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} + ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} else - echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} + echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} fi - 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} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Make sure we do not check glibc for ssp again, as we did already if [ -f "${WORKDIR}/.glibc_ssp_checked" -o \ -f "${ROOT}/etc/env.d/99glibc_spp" ] @@ -543,7 +543,7 @@ src_install() { # 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} + cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -672,7 +672,7 @@ pkg_postinst() { fi if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi # Update libtool linker scripts to reference new gcc version ... @@ -687,7 +687,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.3.2-r7.ebuild b/sys-devel/gcc/gcc-3.3.2-r7.ebuild index 182f3662c220..22f7ee8fd1eb 100644 --- a/sys-devel/gcc/gcc-3.3.2-r7.ebuild +++ b/sys-devel/gcc/gcc-3.3.2-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r7.ebuild,v 1.17 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r7.ebuild,v 1.18 2005/01/11 08:58:54 eradicator Exp $ IUSE="static nls bootstrap java build X multilib gcj" @@ -38,17 +38,17 @@ strip-flags [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" + +LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # 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/\.*/}" +STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}" # ProPolice version PP_VER="3_3" @@ -63,15 +63,15 @@ PATCH_VER="1.0" SNAPSHOT= # Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... +GCC_RELEASE_VER="${PV}" # Tarball, etc used ... #BRANCH_UPDATE="20021208" BRANCH_UPDATE="20040119" if [ -z "${SNAPSHOT}" ] then - S="${WORKDIR}/${PN}-${MAIN_BRANCH}" - SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2" + S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}" + SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2" if [ -n "${PATCH_VER}" ] then @@ -82,7 +82,7 @@ then if [ -n "${BRANCH_UPDATE}" ] then SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" + mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" fi else S="${WORKDIR}/gcc-${SNAPSHOT//-}" @@ -142,7 +142,7 @@ chk_gcc_version() { 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}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -252,7 +252,7 @@ src_unpack() { if [ -z "${SNAPSHOT}" ] then - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 + unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2 if [ -n "${PATCH_VER}" ] then @@ -276,7 +276,7 @@ src_unpack() { # Branch update ... if [ -n "${BRANCH_UPDATE}" ] then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 + epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 fi # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 @@ -497,22 +497,22 @@ src_install() { 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 "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} 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} + ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} else - echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} + echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} fi - 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} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Make sure we do not check glibc for SSP again, as we did already if glibc_have_ssp || \ [ -f "${ROOT}/etc/env.d/99glibc_ssp" ] @@ -570,7 +570,7 @@ src_install() { # 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} + cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -699,7 +699,7 @@ pkg_postinst() { fi if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi # Update libtool linker scripts to reference new gcc version ... @@ -714,7 +714,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.3.2.ebuild b/sys-devel/gcc/gcc-3.3.2.ebuild index b24f0b8d60cc..3085df271e0f 100644 --- a/sys-devel/gcc/gcc-3.3.2.ebuild +++ b/sys-devel/gcc/gcc-3.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2.ebuild,v 1.20 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2.ebuild,v 1.21 2005/01/11 08:58:54 eradicator Exp $ inherit eutils flag-o-matic libtool versionator @@ -21,17 +21,17 @@ do_filter_flags() { [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" + +LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # 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/\.*/}" +STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}" # ProPolice version PP_VER="3_3" @@ -46,15 +46,15 @@ PATCH_VER= SNAPSHOT= # Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... +GCC_RELEASE_VER="${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" + S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}" + SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2" if [ -n "${PATCH_VER}" ] then @@ -65,7 +65,7 @@ then if [ -n "${BRANCH_UPDATE}" ] then SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" + mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" fi else S="${WORKDIR}/gcc-${SNAPSHOT//-}" @@ -119,7 +119,7 @@ chk_gcc_version() { 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}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -147,7 +147,7 @@ version_patch() { src_unpack() { if [ -z "${SNAPSHOT}" ] then - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 + unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2 if [ -n "${PATCH_VER}" ] then @@ -171,7 +171,7 @@ src_unpack() { # Branch update ... if [ -n "${BRANCH_UPDATE}" ] then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 + epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 fi # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 @@ -361,21 +361,21 @@ src_install() { 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 "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} 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} + echo "LDPATH=\"${LIBPATH}:${LIBPATH}/32:${LIBPATH}/../lib64:${LIBPATH}/../lib32\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} else - echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} + echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} fi - 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} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Make sure we dont have stuff lying around that # can nuke multiple versions of gcc @@ -427,7 +427,7 @@ src_install() { # 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} + cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -559,7 +559,7 @@ pkg_postinst() { fi if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi # Update libtool linker scripts to reference new gcc version ... @@ -574,7 +574,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.3.3-r3.ebuild b/sys-devel/gcc/gcc-3.3.3-r3.ebuild index 39847f0396dd..95b014dd83ed 100644 --- a/sys-devel/gcc/gcc-3.3.3-r3.ebuild +++ b/sys-devel/gcc/gcc-3.3.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r3.ebuild,v 1.24 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r3.ebuild,v 1.25 2005/01/11 08:58:54 eradicator Exp $ inherit eutils flag-o-matic libtool versionator @@ -21,17 +21,17 @@ do_filter_flags() { [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" + +LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # 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/\.*/}" +STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}" # PIE support PIE_VER="8.5.3" @@ -49,15 +49,15 @@ PATCH_VER="1.2" SNAPSHOT= # Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... +GCC_RELEASE_VER="${PV}" # Tarball, etc used ... #BRANCH_UPDATE="20021208" BRANCH_UPDATE="20040412" if [ -z "${SNAPSHOT}" ] then - S="${WORKDIR}/${PN}-${MAIN_BRANCH}" - SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2" + S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}" + SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2" if [ -n "${PATCH_VER}" ] then @@ -68,7 +68,7 @@ then if [ -n "${BRANCH_UPDATE}" ] then SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" + mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" fi else S="${WORKDIR}/gcc-${SNAPSHOT//-}" @@ -139,7 +139,7 @@ chk_gcc_version() { 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}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -252,7 +252,7 @@ src_unpack() { if [ -z "${SNAPSHOT}" ] then - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 + unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2 if [ -n "${PATCH_VER}" ] then @@ -272,7 +272,7 @@ src_unpack() { # Branch update ... if [ -n "${BRANCH_UPDATE}" ] then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 + epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 fi # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 @@ -548,22 +548,22 @@ src_install() { 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 "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} 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} + ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} else - echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} + echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} fi - 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} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Make sure we do not check glibc for SSP again, as we did already if glibc_have_ssp || \ [ -f "${ROOT}/etc/env.d/99glibc_ssp" ] @@ -621,7 +621,7 @@ src_install() { # 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} + cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -756,7 +756,7 @@ pkg_postinst() { fi if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi # Update libtool linker scripts to reference new gcc version ... @@ -771,7 +771,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.3.3-r6.ebuild b/sys-devel/gcc/gcc-3.3.3-r6.ebuild index 32432766ecb6..4b2d39895b8a 100644 --- a/sys-devel/gcc/gcc-3.3.3-r6.ebuild +++ b/sys-devel/gcc/gcc-3.3.3-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r6.ebuild,v 1.25 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r6.ebuild,v 1.26 2005/01/11 08:58:54 eradicator Exp $ inherit eutils flag-o-matic libtool gnuconfig versionator @@ -24,17 +24,17 @@ do_filter_flags() { [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" + +LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # 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/\.*/}" +STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}" # PIE support PIE_VER="8.7.6" @@ -52,15 +52,15 @@ PATCH_VER="1.3" SNAPSHOT= # Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... +GCC_RELEASE_VER="${PV}" # Tarball, etc used ... #BRANCH_UPDATE="20021208" BRANCH_UPDATE="20040412" if [ -z "${SNAPSHOT}" ] then - S="${WORKDIR}/${PN}-${MAIN_BRANCH}" - SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2" + S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}" + SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2" if [ -n "${PATCH_VER}" ] then @@ -71,7 +71,7 @@ then if [ -n "${BRANCH_UPDATE}" ] then SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" + mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" fi else S="${WORKDIR}/gcc-${SNAPSHOT//-}" @@ -144,7 +144,7 @@ chk_gcc_version() { local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\ sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')" - if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -271,7 +271,7 @@ src_unpack() { if [ -z "${SNAPSHOT}" ] then - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 + unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2 if [ -n "${PATCH_VER}" ] then @@ -296,7 +296,7 @@ src_unpack() { # Branch update ... if [ -n "${BRANCH_UPDATE}" ] then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 + epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 fi # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 @@ -586,22 +586,22 @@ src_install() { 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 "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} 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} + ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} else - echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} + echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} fi - 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} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Make sure we do not check glibc for SSP again, as we did already if glibc_have_ssp || \ [ -f "${ROOT}/etc/env.d/99glibc_ssp" ] @@ -659,7 +659,7 @@ src_install() { # 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} + cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -791,7 +791,7 @@ pkg_postinst() { fi if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi # Update libtool linker scripts to reference new gcc version ... @@ -806,7 +806,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.3.4-r1.ebuild b/sys-devel/gcc/gcc-3.3.4-r1.ebuild index 66c3b3a3d669..24f138b37e49 100644 --- a/sys-devel/gcc/gcc-3.3.4-r1.ebuild +++ b/sys-devel/gcc/gcc-3.3.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4-r1.ebuild,v 1.24 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4-r1.ebuild,v 1.25 2005/01/11 08:58:54 eradicator Exp $ inherit eutils flag-o-matic libtool gnuconfig versionator @@ -27,17 +27,17 @@ do_filter_flags() { [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" + +LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # 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/\.*/}" +STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}" # PIE support PIE_VER="8.7.6" @@ -55,15 +55,15 @@ PATCH_VER="1.0" SNAPSHOT= # Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... +GCC_RELEASE_VER="${PV}" # Tarball, etc used ... #BRANCH_UPDATE="20040412" BRANCH_UPDATE="20040623" if [ -z "${SNAPSHOT}" ] then - S="${WORKDIR}/${PN}-${MAIN_BRANCH}" - SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2" + S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}" + SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2" if [ -n "${PATCH_VER}" ] then @@ -74,7 +74,7 @@ then if [ -n "${BRANCH_UPDATE}" ] then SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" + mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" fi else S="${WORKDIR}/gcc-${SNAPSHOT//-}" @@ -149,7 +149,7 @@ chk_gcc_version() { local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\ sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')" - if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -276,7 +276,7 @@ src_unpack() { if [ -z "${SNAPSHOT}" ] then - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 + unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2 if [ -n "${PATCH_VER}" ] then @@ -301,7 +301,7 @@ src_unpack() { # Branch update ... if [ -n "${BRANCH_UPDATE}" ] then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 + epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 fi # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 @@ -590,22 +590,22 @@ src_install() { 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 "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} 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} + ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} else - echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} + echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} fi - 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} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Make sure we do not check glibc for SSP again, as we did already if glibc_have_ssp || \ [ -f "${ROOT}/etc/env.d/99glibc_ssp" ] @@ -663,7 +663,7 @@ src_install() { # 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} + cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -795,7 +795,7 @@ pkg_postinst() { fi if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi # Update libtool linker scripts to reference new gcc version ... @@ -810,7 +810,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.3.4-r2.ebuild b/sys-devel/gcc/gcc-3.3.4-r2.ebuild index 56f8df19dae2..d385d509eded 100644 --- a/sys-devel/gcc/gcc-3.3.4-r2.ebuild +++ b/sys-devel/gcc/gcc-3.3.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4-r2.ebuild,v 1.11 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.4-r2.ebuild,v 1.12 2005/01/11 08:58:54 eradicator Exp $ inherit eutils flag-o-matic libtool gnuconfig versionator @@ -27,17 +27,17 @@ do_filter_flags() { [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" - -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" + +LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # 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/\.*/}" +STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}" # PIE support PIE_VER="8.7.6" @@ -55,15 +55,15 @@ PATCH_VER="1.0" SNAPSHOT= # Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... +GCC_RELEASE_VER="${PV}" # Tarball, etc used ... #BRANCH_UPDATE="20040412" BRANCH_UPDATE="20040623" if [ -z "${SNAPSHOT}" ] then - S="${WORKDIR}/${PN}-${MAIN_BRANCH}" - SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2" + S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}" + SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2" if [ -n "${PATCH_VER}" ] then @@ -74,7 +74,7 @@ then if [ -n "${BRANCH_UPDATE}" ] then SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" + mirror://gentoo/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" fi else S="${WORKDIR}/gcc-${SNAPSHOT//-}" @@ -142,7 +142,7 @@ chk_gcc_version() { local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\ sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')" - if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -269,7 +269,7 @@ src_unpack() { if [ -z "${SNAPSHOT}" ] then - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 + unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2 if [ -n "${PATCH_VER}" ] then @@ -294,7 +294,7 @@ src_unpack() { # Branch update ... if [ -n "${BRANCH_UPDATE}" ] then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 + epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 fi # Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 @@ -585,22 +585,22 @@ src_install() { 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 "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} 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} + ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} else - echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} + echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} fi - 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} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Make sure we do not check glibc for SSP again, as we did already if glibc_have_ssp || \ [ -f "${ROOT}/etc/env.d/99glibc_ssp" ] @@ -658,7 +658,7 @@ src_install() { # 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} + cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -790,7 +790,7 @@ pkg_postinst() { fi if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi # Update libtool linker scripts to reference new gcc version ... @@ -805,7 +805,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.4.1-r3.ebuild b/sys-devel/gcc/gcc-3.4.1-r3.ebuild index 5a584378893d..570b0f4f15f2 100644 --- a/sys-devel/gcc/gcc-3.4.1-r3.ebuild +++ b/sys-devel/gcc/gcc-3.4.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r3.ebuild,v 1.12 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r3.ebuild,v 1.13 2005/01/11 08:58:54 eradicator Exp $ IUSE="static nls bootstrap build multilib gcj gtk fortran objc hardened uclibc n32 n64" @@ -75,7 +75,7 @@ if [ ${PV} != ${PV/_pre/-} ] ; then fi # Branch update support ... -MAIN_BRANCH="${PV}" # Tarball, etc used ... +GCC_RELEASE_VER="${PV}" # Tarball, etc used ... BRANCH_UPDATE=20040803 # PIE support @@ -95,12 +95,12 @@ elif [ -n "${SNAPSHOT}" ] ; then S="${WORKDIR}/gcc-${SNAPSHOT//-}" SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2" else - S="${WORKDIR}/${PN}-${MAIN_BRANCH}" - SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2" + S="${WORKDIR}/${PN}-${GCC_RELEASE_VER}" + SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${GCC_RELEASE_VER}.tar.bz2" if [ -n "${BRANCH_UPDATE}" ] then SRC_URI="${SRC_URI} - ${GENTOO_BASE_URI}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2" + ${GENTOO_BASE_URI}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" fi fi @@ -176,26 +176,26 @@ do_filter_flags() { [ ! -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 }'`" -MY_PV="$(get_version_component_range 1-2)" -MY_PV_FULL="$(get_version_component_range 1-3)" +#GCC_BRANCH_VER="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#GCC_RELEASE_VER="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +GCC_BRANCH_VER="$(get_version_component_range 1-2)" +GCC_RELEASE_VER="$(get_version_component_range 1-3)" # GCC 3.4 no longer uses gcc-lib. we'll rename this later for compatibility # reasons, as a few things would break without gcc-lib. -LIBPATH="${LOC}/lib/gcc/${CCHOST}/${MY_PV_FULL}" -BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" -DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" +LIBPATH="${LOC}/lib/gcc/${CCHOST}/${GCC_RELEASE_VER}" +BINPATH="${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}" +DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${GCC_BRANCH_VER}" # 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/\.*/}" +STDCXX_INCDIR="${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}" # 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 ... # GCC 3.4 introduces a new version of libstdc++ -SLOT="${MY_PV}" +SLOT="${GCC_BRANCH_VER}" has_lib64() { use amd64 && return 0 @@ -209,7 +209,7 @@ chk_gcc_version() { local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\ sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')" - if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -469,7 +469,7 @@ src_unpack() { elif [ -n "${SNAPSHOT}" ] ; then unpack gcc-${SNAPSHOT//-}.tar.bz2 else - unpack ${PN}-${MAIN_BRANCH}.tar.bz2 + unpack ${PN}-${GCC_RELEASE_VER}.tar.bz2 fi if [ -n "${PATCH_VER}" ] @@ -492,7 +492,7 @@ src_unpack() { # Branch update ... if [ -n "${BRANCH_UPDATE}" ] then - epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2 + epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 fi do_patch_tarball @@ -747,8 +747,8 @@ src_install() { 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 "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # The LDPATH stuff is kinda iffy now that we need to provide compatibility # with older versions of GCC for binary apps. @@ -763,14 +763,14 @@ src_install() { then LDPATH="${LDPATH}:${LOC}/lib/gcc-lib/${CCHOST}/${BULIB}" fi - echo "LDPATH=\"${LDPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} + echo "LDPATH=\"${LDPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} - 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} + echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # 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} + echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} + echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER} # Make sure we do not check glibc for SSP again, as we did already if glibc_have_ssp || \ @@ -829,7 +829,7 @@ src_install() { # 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} + cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -971,7 +971,7 @@ pkg_postinst() { fi if [ "${ROOT}" = "/" -a "${CHOST}" = "${CCHOST}" ] then - gcc-config --use-portage-chost ${CCHOST}-${MY_PV_FULL} + gcc-config --use-portage-chost ${CCHOST}-${GCC_RELEASE_VER} fi # Update libtool linker scripts to reference new gcc version ... @@ -986,7 +986,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.4.2-r2.ebuild b/sys-devel/gcc/gcc-3.4.2-r2.ebuild index 75ee82e224fe..d872bc2fa04e 100644 --- a/sys-devel/gcc/gcc-3.4.2-r2.ebuild +++ b/sys-devel/gcc/gcc-3.4.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.2-r2.ebuild,v 1.24 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.2-r2.ebuild,v 1.25 2005/01/11 08:58:54 eradicator Exp $ DESCRIPTION="The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking" @@ -109,7 +109,7 @@ chk_gcc_version() { local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\ sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')" - if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -280,7 +280,7 @@ src_install() { # 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}${PREFIX}/${CTARGET}/gcc-bin/${MY_PV_FULL} + cd ${D}${PREFIX}/${CTARGET}/gcc-bin/${GCC_RELEASE_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -439,7 +439,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ diff --git a/sys-devel/gcc/gcc-3.4.3.20050110.ebuild b/sys-devel/gcc/gcc-3.4.3.20050110.ebuild new file mode 100644 index 000000000000..f0fe82ea1ca7 --- /dev/null +++ b/sys-devel/gcc/gcc-3.4.3.20050110.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.20050110.ebuild,v 1.1 2005/01/11 08:58:54 eradicator Exp $ + +DESCRIPTION="The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking" + +#KEYWORDS="-* ~amd64 ~mips ~ppc64 ~x86 -hppa ~ppc ~sparc ~ia64" +KEYWORDS="-*" + +# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs +# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper +# .eh_frame ld optimisation and symbol visibility support, but it hasnt been +# well tested in gentoo on any arch other than amd64!! +RDEPEND="virtual/libc + >=sys-devel/gcc-config-1.3.6-r4 + >=sys-libs/zlib-1.1.4 + !sys-devel/hardened-gcc + !uclibc? ( + >=sys-libs/glibc-2.3.3_pre20040420-r1 + hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 ) + ) + amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) ) + !build? ( + gcj? ( + gtk? ( >=x11-libs/gtk+-2.2 ) + >=media-libs/libart_lgpl-2.1 + ) + >=sys-libs/ncurses-5.2-r2 + nls? ( sys-devel/gettext ) + )" +DEPEND="${RDEPEND} + >=sys-apps/texinfo-4.2-r4 + >=sys-devel/bison-1.875 + >=sys-devel/binutils-2.14.90.0.8-r1 + amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )" +PDEPEND="sys-devel/gcc-config + !nocxx? ( !mips? ( !ia64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )" + + +GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~eradicator/gcc/" +#GCC_MANPAGE_VERSION="none" +PATCH_VER="1.1" +PIE_VER="8.7.7" +PIE_CORE="gcc-3.4.3-piepatches-v${PIE_VER}.tar.bz2" +PP_VER="3.4.3.20050110" +PP_FVER="${PP_VER//_/.}-0" +HTB_VER="1.00" +HTB_GCC_VER="3.4.2" + +GCC_LIBSSP_SUPPORT="true" + +ETYPE="gcc-compiler" + +# arch/libc configurations known to be stable with {PIE,SSP}-by-default +SSP_STABLE="x86 sparc amd64" +SSP_UCLIBC_STABLE="arm mips ppc x86" +PIE_GLIBC_STABLE="x86 sparc amd64" +PIE_UCLIBC_STABLE="x86 mips ppc" + +# arch/libc configurations known to be broken with {PIE,SSP}-by-default +SSP_UNSUPPORTED="hppa" +SSP_UCLIBC_UNSUPPORTED="${SSP_UNSUPPORTED}" +PIE_UCLIBC_UNSUPPORTED="alpha amd64 arm hppa ia64 m68k ppc64 s390 sh sparc" +PIE_GLIBC_UNSUPPORTED="hppa" + +# whether we should split out specs files for multiple {PIE,SSP}-by-default +# and vanilla configurations. +SPLIT_SPECS="${SPLIT_SPECS:="true"}" + +#GENTOO_PATCH_EXCLUDE="" +#PIEPATCH_EXCLUDE="" + +inherit eutils flag-o-matic libtool gnuconfig toolchain + +src_unpack() { + gcc_src_unpack + + # bah + sed -e 's/3\.4\.4/3.4.3/' -i ${S}/gcc/version.c + + # misc patches that havent made it into a patch tarball yet + epatch ${FILESDIR}/3.4.0/gcc34-reiser4-fix.patch + epatch ${FILESDIR}/gcc-spec-env.patch + epatch ${FILESDIR}/3.4.2/810-arm-bigendian-uclibc.patch + + # nothing in the tree provides libssp.so, so nothing will ever trigger this + # logic, but having the patch in the tree makes life so much easier for me + # since I dont have to also have an overlay for this. + want_libssp && epatch ${FILESDIR}/3.4.3/libssp.patch + + # Anything useful and objc will require libffi. Seriously. Lets just force + # libffi to install with USE="objc", even though it normally only installs + # if you attempt to build gcj. + if use objc && ! use gcj ; then + epatch ${FILESDIR}/3.4.3/libffi-without-libgcj.patch + #epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch + fi + + # hack around some ugly 32bit sse2 wrong-code bugs + epatch ${FILESDIR}/3.4.2/gcc34-m32-no-sse2.patch + epatch ${FILESDIR}/3.4.2/gcc34-fix-sse2_pinsrw.patch + + # Fix cross-compiling + epatch ${FILESDIR}/3.4.3/gcc-3.4.3-cross-compile.patch + + # If mips, and we DON'T want multilib, then rig gcc to only use n32 OR n64 + einfo "Applying CTARGET based patches: ${CTARGET}" + case "${CTARGET}" in + mips*-*) + # If mips, and we DON'T want multilib, then rig gcc to only use n32 OR n64 + if use !multilib; then + use n32 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n32only.patch + use n64 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n64only.patch + fi + + # Patch forward-ported from a gcc-3.0.x patch that adds -march=r10000 and + # -mtune=r10000 support to gcc (Allows the compiler to generate code to + # take advantage of R10k's second ALU, perform shifts, etc.. + # + # Needs re-porting to DFA in gcc-4.0 - Any Volunteers? :) + epatch ${FILESDIR}/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch + + # This is a very special patch -- it allows us to build semi-usable kernels + # on SGI IP28 (Indigo2 Impact R10000) systems. The patch is henceforth + # regarded as a kludge by upstream, and thus, it will never get accepted upstream, + # but for our purposes of building a kernel, it works. + # Unless you're building an IP28 kernel, you really don't need care about what + # this patch does, because if you are, you are probably already aware of what + # it does. + # All that said, the abilities of this patch are disabled by default and need + # to be enabled by passing -mip28-cache-barrier. Only used to build kernels, + # There is the possibility it may be used for very specific userland apps too. + if use ip28; then + epatch ${FILESDIR}/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers.patch + fi + ;; + x86_64-*) + if use multilib; then + epatch ${FILESDIR}/3.4.1/gcc-3.4.1-glibc-is-native.patch + cd ${S}/libstdc++-v3 + einfo "running autoreconf..." + autoreconf 2> /dev/null + cd ${S} + fi + ;; + esac +} diff --git a/sys-devel/gcc/gcc-3.4.3.ebuild b/sys-devel/gcc/gcc-3.4.3.ebuild index 0d6782623afa..f5f1c4de4d45 100644 --- a/sys-devel/gcc/gcc-3.4.3.ebuild +++ b/sys-devel/gcc/gcc-3.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.ebuild,v 1.15 2005/01/07 01:47:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.ebuild,v 1.16 2005/01/11 08:58:54 eradicator Exp $ DESCRIPTION="The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking" @@ -95,7 +95,7 @@ chk_gcc_version() { local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\ sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')" - if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ] + if [ "${OLD_GCC_VERSION}" != "${GCC_RELEASE_VER}" ] then echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" fi @@ -263,7 +263,7 @@ src_install() { # 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}${PREFIX}/${CTARGET}/gcc-bin/${MY_PV_FULL} + cd ${D}${PREFIX}/${CTARGET}/gcc-bin/${GCC_RELEASE_VER} [ -f jar ] && mv -f jar gcj-jar # Move <cxxabi.h> to compiler-specific directories @@ -438,7 +438,7 @@ pkg_postinst() { then OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" else - OLD_GCC_VERSION="${MY_PV_FULL}" + OLD_GCC_VERSION="${GCC_RELEASE_VER}" fi if [ -f "${WORKDIR}/.oldgccchost" ] && \ |