Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52b867349ef1ef3cca8b788fb512b6000c268f37
commit 52b867349ef1ef3cca8b788fb512b6000c268f37 Author: crazy <[EMAIL PROTECTED]> Date: Sat Jun 7 15:18:28 2008 +0200 gcc-4.3.1-1-x86_64 * Version bump * replaced patches by Fsed since autoconf is broken and does not work * updated man pages to latest snapshot * first step for FS#3131 diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 8030187..4581700 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -2,23 +2,23 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=gcc -pkgver=4.3.0 -pkgrel=5 +pkgver=4.3.1 +pkgrel=1 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') makedepends=('mpfr' 'gcc-gnat' 'gtk+2' 'libart_lgpl' 'libxtst' 'zip' 'xulrunner' 'grep>=2.5.3-2' \ 'ecj' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ - 'libxdamage' 'alsa-lib' 'fastjar>=0.95') + 'libxdamage' 'alsa-lib' 'fastjar>=0.95' 'libtool') provides=('c-compiler') groups=('devel' 'devel-core') archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump $url|grep Current|sed 's/.*GCC //'" source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-20080211.tar.bz2 \ - README.Frugalware remove_broken_class_loader_test.patch fastjar-only.patch) -signatures=("$source.sig" '' '' '' '') + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.20080508.tar.bz2 \ + README.Frugalware) +signatures=("$source.sig" '' '') subpkgs=('libgcc' 'libstdc++' \ 'libgnat' 'gcc-gnat' \ @@ -64,17 +64,14 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' build() { + Fcd Fsed 'lib64' 'lib' gcc/config/i386/t-linux64 # no fixincludes, thanks Fsed '\./fixinc\.sh' '-c true' gcc/Makefile.in - # fix for newer xulrunner Fpatchall - Fsed 'xulrunner-plugin' 'xulrunner-plugin xulrunner-xpcom' libjava/classpath/configure.ac - cd libjava/classpath || Fdie - autoconf || return 1 - cd .. || Fdie - autoconf || return 1 - cd .. || Fdie + ## well reconf / autoreconf is br0ken in gcc .. so do it that way heh + Fsed '--with-fastjar=$JAR' '--with-fastjar=/usr/bin/fastjar' libjava/configure + mkdir ../$pkgname-build || Fdie cd ../$pkgname-build || Fdie CC="$FCC gcc" CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" XCFLAGS="$CFLAGS" \ @@ -86,6 +83,7 @@ build() --enable-threads=posix \ --enable-__cxa_atexit \ --enable-java-awt=gtk \ + --with-fastjar=/usr/bin/fastjar \ --with-ecj \ --with-ecj-jar=/usr/share/java/eclipse-ecj.jar \ --enable-gtk-cairo \ @@ -164,7 +162,7 @@ build() Fdoc README.Frugalware Fmkdir /usr/man/man3 # Note: man snapshots are called man.$snapshot and released tarballs are man-$the_version - cp $Fsrcdir/man.20080211/man3/* $Fdestdir/usr/man/man3/ || Fdie + cp $Fsrcdir/libstdc++-man.20080508/man3/* $Fdestdir/usr/man/man3/ || Fdie # split the pkg # libgcc diff --git a/source/devel/gcc/fastjar-only.patch b/source/devel/gcc/fastjar-only.patch deleted file mode 100644 index 507729f..0000000 --- a/source/devel/gcc/fastjar-only.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gcc-4.3.0/libjava/configure.ac gcc-4.3.0-p/libjava/configure.ac ---- gcc-4.3.0/libjava/configure.ac 2007-12-22 16:48:46.000000000 +0100 -+++ gcc-4.3.0-p/libjava/configure.ac 2008-03-16 13:54:45.000000000 +0100 -@@ -114,7 +114,7 @@ - AC_CHECK_TOOL(AR, ar) - AC_CHECK_TOOL(RANLIB, ranlib, :) - AC_PROG_AWK --AC_CHECK_PROGS([JAR], [jar fastjar gjar], no) -+AC_CHECK_PROGS([JAR], [fastjar], yes) - AC_PATH_PROG([ZIP], [zip], no) - AC_PATH_PROG([UNZIP], [unzip], unzip) - diff --git a/source/devel/gcc/remove_broken_class_loader_test.patch b/source/devel/gcc/remove_broken_class_loader_test.patch deleted file mode 100644 index 5c404ec..0000000 --- a/source/devel/gcc/remove_broken_class_loader_test.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- gcc-4_3-branch/libjava/link.cc 2008/02/18 22:35:48 132392 -+++ gcc-4_3-branch/libjava/link.cc 2008/03/13 18:20:41 133180 -@@ -359,40 +359,6 @@ - throw new java::lang::NoSuchMethodError (sb->toString()); - } - -- // if (found_class->loader != klass->loader), then we -- // must actually check that the types of arguments -- // correspond. That is, for each argument type, and -- // the return type, doing _Jv_FindClassFromSignature -- // with either loader should produce the same result, -- // i.e., exactly the same jclass object. JVMS 5.4.3.3 -- if (found_class->loader != klass->loader) -- { -- JArray<jclass> *found_args, *klass_args; -- jclass found_return, klass_return; -- -- _Jv_GetTypesFromSignature (the_method, -- found_class, -- &found_args, -- &found_return); -- _Jv_GetTypesFromSignature (the_method, -- klass, -- &klass_args, -- &klass_return); -- -- jclass *found_arg = elements (found_args); -- jclass *klass_arg = elements (klass_args); -- -- for (int i = 0; i < found_args->length; i++) -- { -- if (*(found_arg++) != *(klass_arg++)) -- throw new java::lang::LinkageError (JvNewStringLatin1 -- ("argument type mismatch with different loaders")); -- } -- if (found_return != klass_return) -- throw new java::lang::LinkageError (JvNewStringLatin1 -- ("return type mismatch with different loaders")); -- } -- - return the_method; - } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
