Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=3d5984119655ec6ac77b070af59f08f4ebfd1cfd
commit 3d5984119655ec6ac77b070af59f08f4ebfd1cfd Author: crazy <[EMAIL PROTECTED]> Date: Sun Mar 9 00:55:49 2008 +0100 java-gcj-compat-1.0.77-1-i686 * Version bump * build for gcj 4.3.0 * I ( yes me 'when-I-see-java-I-usually-run-away-crazy ;) ) * hope I didn't broke anything =) diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index bdade82..fcc5be6 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -2,38 +2,30 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=java-gcj-compat -pkgver=1.0.72 -pkgrel=8 -gccver=4.2.3 +pkgver=1.0.77 +pkgrel=1 +gccver=4.3.0 javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." url="ftp://sources.redhat.com/pub/rhug/"; depends=("libgcj=$gccver" 'gjdoc') -makedepends=('gcc-gcj' 'ecj') +makedepends=('gcc-gcj=$gccver' 'ecj') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep $pkgname-.*tar.gz$|sed 's/.*-\([^-]*\)\.t.*/\1/'|Fsort|sed -n '$ p'" source=(ftp://sources.redhat.com/pub/rhug/java-gcj-compat-$pkgver.tar.gz \ - java-gcj.sh) -sha1sums=('4f5267544927e1826facbd988ecb4992dde43f76'\ - '73c1f3cc2db4f63cb051e65f0c664358289e9f13') - -# yes, there is a newer version. to bump it, we have to patch gcc: -# http://gcc.gnu.org/ml/java-patches/2007-q1/msg00656.html -# and here are some infos about what new options gcc will need: -# http://gcc.gnu.org/ml/java-patches/2007-q1/msg00658.html -# a simple check is to -# ls libjava/classpath/tools/classes/com/sun/javadoc/SourcePosition.class -# if that file exists, then we can bump this pkg + java-gcj.sh symlink-gjar-fastjar-is-gone-since-gcc4.2.patch) +sha1sums=('07b4058ed0a254462d5196fee91e660d434f84ec' \ + '73c1f3cc2db4f63cb051e65f0c664358289e9f13' \ + 'f3cd78dde7169bfe841943ae508f5a073e2fc4e7') build() { - Fsed 'libgcj-tools' 'libgcj' Makefile.am - Fsed '4.1.2' $gccver Makefile.am - Fsed 'fastjar' 'jar' configure.ac Makefile.am + Fcd + Fpatchall Fautoreconf - Fbuild - Fln jvm/java-$javaver/lib/tools.jar /usr/lib/ + Fconf + Fmakeinstall Fexe /etc/profile.d/java-gcj.sh echo 'if [ -z "$CLASSPATH" ]; then' >>$Fdestdir/etc/profile.d/java-gcj.sh echo " export CLASSPATH=/usr/share/java/libgcj-$gccver.jar" >>$Fdestdir/etc/profile.d/java-gcj.sh @@ -42,10 +34,9 @@ build() >>$Fdestdir/etc/profile.d/java-gcj.sh echo "fi" >>$Fdestdir/etc/profile.d/java-gcj.sh Fln /usr/bin/gjdoc /usr/lib/jvm/java-$javaver/bin/javadoc - # gcc-4.2.0, no more fastjar - Frm /usr/bin/jar # openoffice.org wants this - Fln gcj-$gccver/libjawt.so /usr/lib + gcjver=$(basename /usr/lib/gcj-${gccver}*) + Fln gcj-$gcjver/libjawt.so /usr/lib } # optimization OK diff --git a/source/devel-extra/java-gcj-compat/symlink-gjar-fastjar-is-gone-since-gcc4.2.patch b/source/devel-extra/java-gcj-compat/symlink-gjar-fastjar-is-gone-since-gcc4.2.patch new file mode 100644 index 0000000..7f18ebf --- /dev/null +++ b/source/devel-extra/java-gcj-compat/symlink-gjar-fastjar-is-gone-since-gcc4.2.patch @@ -0,0 +1,12 @@ +diff -Naur java-gcj-compat-1.0.77/Makefile.am java-gcj-compat-1.0.77-p/Makefile.am +--- java-gcj-compat-1.0.77/Makefile.am 2007-06-26 21:51:19.000000000 +0200 ++++ java-gcj-compat-1.0.77-p/Makefile.am 2008-03-08 20:43:21.000000000 +0100 +@@ -17,7 +17,7 @@ + $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS) + ln -sf ../../../../bin/gij$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/java + ln -sf ../../../../../bin/gij$(gcc_suffix) $(DESTDIR)$(JRE_BIN_DIR)/java +- ln -sf ../../../../bin/fastjar$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/jar ++ ln -sf ../../../../bin/gjar$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/jar + ln -sf ../../../../bin/sinjdoc $(DESTDIR)$(SDK_BIN_DIR)/javadoc + ln -sf ../../../../bin/grmic$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/rmic + ln -sf ../../../../bin/gjavah$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/javah _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
