diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-06-08 01:45:07 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-06-08 01:45:07 +0000 |
commit | 98ee04084cbb599e864a72604175f1069350fe36 (patch) | |
tree | a61cb65b684e16793f9d13d9c33a2ac9eacceffc | |
parent | Fix use invocation (diff) | |
download | historical-98ee04084cbb599e864a72604175f1069350fe36.tar.gz historical-98ee04084cbb599e864a72604175f1069350fe36.tar.bz2 historical-98ee04084cbb599e864a72604175f1069350fe36.zip |
Fix #30849 and clean up the ebuild in general
-rw-r--r-- | sys-devel/gcc/ChangeLog | 8 | ||||
-rw-r--r-- | sys-devel/gcc/Manifest | 12 | ||||
-rw-r--r-- | sys-devel/gcc/files/digest-gcc-3.1.1-r2 (renamed from sys-devel/gcc/files/digest-gcc-3.1.1-r1) | 0 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-3.1.1-r2.ebuild (renamed from sys-devel/gcc/gcc-3.1.1-r1.ebuild) | 23 |
4 files changed, 20 insertions, 23 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 158278910784..f41b1bf726dc 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/gcc # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.266 2004/06/05 22:20:41 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.267 2004/06/08 01:45:07 vapier Exp $ + +*gcc-3.1.1-r2 (07 Jun 2004) + + 07 Jun 2004; Mike Frysinger <vapier@gentoo.org> -gcc-3.1.1-r1.ebuild, + +gcc-3.1.1-r2.ebuild: + Fix long standing env bug #30849 and use epatch instead of patch. 05 Jun 2004; Travis Tilley <lv@gentoo.org> +files/3.4.0/reiser4-why-do-you-hate-me.patch, gcc-3.4.0-r6.ebuild: diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index a1018a8ce7c9..4a6382eb1aae 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 86661ba0ca338a2783dd95296df291f3 ChangeLog 55289 +MD5 a4150c4f20e679e52408ed1357e6224d ChangeLog 55486 +MD5 5c06c7b9c6fd156d3bd1383323c3e2e2 gcc-3.1.1-r2.ebuild 9167 MD5 ff1e34206f0acd8bf35fdfe97d7416d4 gcc-2.95.3-r8.ebuild 9108 MD5 f6c84e13f0ffb79fa7856b2f7a3a1e63 gcc-3.0.4-r6.ebuild 8460 MD5 3a2e4f5d5f2d94e5ee2a399ab3b0f32e gcc-3.3-r1.ebuild 16506 -MD5 ca02ab22b16026345e426c4698eb3058 gcc-3.1.1-r1.ebuild 9451 MD5 b5f1d4d71ad38c5c5e489466ac0ad399 gcc-3.3.3-r3.ebuild 24690 MD5 b33c1f60ade8ee3d1ad43023d788952a gcc-3.3.3-r6.ebuild 25264 MD5 fafb9acfeb8b7e2206d43e41ea031f90 gcc-3.4.0-r6.ebuild 29802 @@ -31,10 +31,10 @@ MD5 3b2fd4637666e71aae9954782cd23016 gcc-3.3.3_pre20040426.ebuild 22633 MD5 66229a95f7bb2856fd07dfd0d6589480 gcc-3.3.3-r5.ebuild 25326 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24 +MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r2 140 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64 MD5 4a4be6eb294e00da7fef14ec597dcf13 files/digest-gcc-3.0.4-r6 128 MD5 5a9db19cd5ad6ad16b0f838d525d842a files/digest-gcc-3.3.3-r3 522 -MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140 MD5 651abb651e5fdcec7c83354b5742d26d files/digest-gcc-3.4.0-r6 443 MD5 3fd5a29d44b89f4fb220fccaa968fc05 files/digest-gcc-3.3.3-r6 442 MD5 9c13e6b0d5770979430b76c578afa22c files/gcc3-program-transform.patch 9771 @@ -137,7 +137,7 @@ MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/reiser4-why-do-you-hate-me.patc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.8 (GNU/Linux) -iD8DBQFAxRYlHTu7gpaalycRAuj+AKDaQjIwTa5060oxhIlayeKSCPGFigCgjuVd -IqhdlSaA3jn/n5Xl1yPcJYY= -=tl42 +iD8DBQFAxRosHTu7gpaalycRAh1wAJ9ykZdbRwSpsmeUgDc/WnyI7caUTACfVFDC +2O6YGpC2lwVEGgCB/iq9XQ4= +=4qj+ -----END PGP SIGNATURE----- diff --git a/sys-devel/gcc/files/digest-gcc-3.1.1-r1 b/sys-devel/gcc/files/digest-gcc-3.1.1-r2 index 4306377f63b0..4306377f63b0 100644 --- a/sys-devel/gcc/files/digest-gcc-3.1.1-r1 +++ b/sys-devel/gcc/files/digest-gcc-3.1.1-r2 diff --git a/sys-devel/gcc/gcc-3.1.1-r1.ebuild b/sys-devel/gcc/gcc-3.1.1-r2.ebuild index 4d84e9ca99e7..5f7008b4a3b8 100644 --- a/sys-devel/gcc/gcc-3.1.1-r1.ebuild +++ b/sys-devel/gcc/gcc-3.1.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.1-r1.ebuild,v 1.16 2004/06/07 23:37:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.1-r2.ebuild,v 1.1 2004/06/08 01:45:07 vapier Exp $ # NOTE TO MAINTAINER: Info pages get nuked for multiple version installs. # Ill fix it later if i get a chance. @@ -9,7 +9,7 @@ # in src_install() ... Ill implement auto-version detection # later on. -inherit flag-o-matic libtool +inherit flag-o-matic libtool eutils do_filter_flags() { # Compile problems with these ... @@ -25,7 +25,6 @@ GCC_SUFFIX=-${MY_PV} LOC="/usr" # dont install in /usr/include/g++-v3/, as it will nuke gcc-3.0.x installs STDCXX_INCDIR="${LOC}/include/g++-v${MY_PV/\./}" -PATCHES="${WORKDIR}/patches" DESCRIPTION="Modern GCC C/C++ compiler" HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" @@ -70,23 +69,15 @@ FAKE_ROOT="" src_unpack() { unpack ${P}.tar.bz2 - mkdir -p ${WORKDIR}/patches - tar -jxf ${DISTDIR}/${P}_final-patches-1.0.tbz2 -C ${WORKDIR}/patches || \ - die "Could not unpack patches" - cd ${S} # Fixup libtool to correctly generate .la files with portage elibtoolize --portage --shallow - for x in ${PATCHES}/*.patch - do - # sad to say booboo I relised *after* uploading the patch to ibiblio :( - if [ "${x##*/}" = "28_gcc31-c++-diagnostic-no-line-wrapping.patch" ] - then - patch -p1 < ${x} || die "Failed with patch ${x##*/}" - else - patch -p0 < ${x} || die "Failed with patch ${x##*/}" - fi + mkdir -p ${WORKDIR}/patch + tar -jxf ${DISTDIR}/${P}_final-patches-1.0.tbz2 -C ${WORKDIR}/patch \ + || die "Could not unpack patches" + for f in ${WORKDIR}/patch/*.patch ; do + epatch ${f} done # Currently if any path is changed via the configure script, it breaks |