Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=e2ee0afcc945470f7c5e6174176932a95866beec
commit e2ee0afcc945470f7c5e6174176932a95866beec Author: crazy <[EMAIL PROTECTED]> Date: Tue Mar 11 18:46:07 2008 +0100 gcc-4.3.0-4-i686 * release bump * added an patch to fix gjar problems with * './' prefixes not being stripped at all. diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 4296981..b301b9c 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gcc pkgver=4.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org"; depends=('binutils>=2.18.50.0.4-2' 'libstdc++' 'glibc>=2.7-3' 'mpfr>=2.3.1-2') @@ -18,11 +18,12 @@ up2date="lynx -dump $url|grep Current|sed 's/.*GCC //'" #source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ source=(ftp://ftp.gwdg.de/pub/misc/gcc/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2 \ ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-4.2.2.tar.bz2 \ - README.Frugalware) + README.Frugalware gjar-prefix.patch) #signatures=("$source.sig" '' '') sha1sums=('d6ae7f024b99ba9b85f253fdeb00a9a1d6f1fc8d' \ 'd3c9af69bb788334a67039bbe056606e8590a8a7' \ - '9ff2a95f1336cfbf90a7852f34f1db0b31c82dca') + '9ff2a95f1336cfbf90a7852f34f1db0b31c82dca' \ + '0a9fa719eac4fef5e0fe29014421110635c50dcd') subpkgs=('libgcc' 'libstdc++' \ 'libgnat' 'gcc-gnat' \ diff --git a/source/devel/gcc/gjar-prefix.patch b/source/devel/gcc/gjar-prefix.patch new file mode 100644 index 0000000..20363af --- /dev/null +++ b/source/devel/gcc/gjar-prefix.patch @@ -0,0 +1,36 @@ +diff -Naur gcc-4.3.0/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java gcc-4.3.0-p/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java +--- gcc-4.3.0/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java 2006-06-09 18:07:07.000000000 +0200 ++++ gcc-4.3.0-p/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java 2008-03-11 15:59:07.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Entry.java - represent a single file to write to a jar +- Copyright (C) 2006 Free Software Foundation, Inc. ++ Copyright (C) 2006, 2007 Free Software Foundation, Inc. + + This file is part of GNU Classpath. + +@@ -49,12 +49,22 @@ + public Entry(File file, String name) + { + this.file = file; +- this.name = name; ++ ++ /* Removes any './' prefixes automatically. Those caused trouble ++ * in (boot) classpath use-cases. See #32516. ++ */ ++ int start = 0; ++ while (name.length() > start + 2 ++ && name.codePointAt(start) == '.' ++ && name.codePointAt(start + 1) == File.separatorChar) ++ start += 2; ++ ++ this.name = name.substring(start); + } + + public Entry(File file) + { +- this.file = file; +- this.name = file.toString(); ++ this(file, file.toString()); + } ++ + } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
