Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=9bf4a6956eaf4e11046caaa587a4799ab4d784b1
commit 9bf4a6956eaf4e11046caaa587a4799ab4d784b1 Author: crazy <[EMAIL PROTECTED]> Date: Tue Mar 11 12:58:06 2008 +0100 ecj-3.2.2-1-i686 * downgrade ( round 1 ) * ( but only from version , 3.3.1 package used 3.2.2 source heh ) * added comments on how to get the source and where to put it * also added comments about the 3.3* series * added fixup patches from vmiklos * added force to the package diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index a5561a5..48c51f5 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -2,25 +2,38 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=ecj -pkgver=3.3.2 +pkgver=3.2.2 date=200802211800 -gccver=4.3.0 -pkgrel=2 +pkgrel=1 pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project." url="http://www.eclipse.org/"; groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.eclipse.org/eclipse/downloads/|grep Release|sed -n 's/.*]\([0-9\.]*\) .*/\1/;1 p'" -source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip ecj-gcj.patch) -sha1sums=('c9229f01f991777829279d9907069e81857516ca' \ - '51bfaa1069ae5d0a81dee641fd8cfa093365d451') +## NOTE: when you bump that package you should _NOT_ use the source as is from ecplipe because +## it does not have any version and we end up to package it wrong. +## Also when you bump this package create a new dir in sources/ecj on our ftp ( eg: 3.3.1 ) +## get the ecjsrc.zip from eclipse and 'be sure is the version you want to bump to' and move it +## to be ecjsrc-$the_version.zip ( eg: ecjsrc-3.3.1.zip ) in that folder. +## NOTE2: 3.3* series have some problems with gcj 4.3* , until we figure why do not bump +## this package to any 3.3* series +## If someone wonders why we drop back to 3.2.2 that is simply because we used 3.2.2 and not 3.3.1.1 =) +## and this version does work. +#source=(http://download.eclipse.org/eclipse/downloads/drops/R-$pkgver-$date/ecjsrc.zip \ +source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgver/ecjsrc-$pkgver.zip \ + ecj-gcj.patch ecj-square-bracket-classpath.diff) +sha1sums=('50f6b20a1542176e46d48fa522b9f24b2399878b' \ + 'e79f7ca323e4e5dac8b15f498626413ffb7977cb' \ + '9824cc2be79d66e03705d89b3445400d097d52a6') Finclude java -makedepends=("gcc-gcj>=$gccver" "$pkgname>=3.3.2") +options=('force') +makedepends=("gcc-gcj") +_F_cd_path="." build() { + Fpatchall # this will be a separete package since these must be compiled with ecj - patch -p1 <ecj-gcj.patch || Fdie rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java rm -rf org/eclipse/jdt/internal/antadapter @@ -31,7 +44,7 @@ build() gcj -encoding ISO-8859-1 -C `find org/ -name '*.java'` || return 1 find -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \ - xargs gjar cf eclipse-ecj.jar + xargs jar cf eclipse-ecj.jar Ffilerel /usr/share/java/eclipse-ecj.jar Fgcj org.eclipse.jdt.internal.compiler.batch.Main $Fdestdir/usr/bin/ecj \ $Fdestdir/usr/share/java/eclipse-ecj.jar diff --git a/source/devel-extra/ecj/ecj-gcj.patch b/source/devel-extra/ecj/ecj-gcj.patch index 9cd8ada..1307147 100644 --- a/source/devel-extra/ecj/ecj-gcj.patch +++ b/source/devel-extra/ecj/ecj-gcj.patch @@ -1,25 +1,6 @@ -Index: batch/org/eclipse/jdt/internal/compiler/batch/messages.properties -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties,v -retrieving revision 1.546.2.23 -diff -u -r1.546.2.23 messages.properties ---- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties 8 Feb 2007 15:04:43 -0000 1.546.2.23 -+++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties 26 Feb 2007 18:21:06 -0000 -@@ -249,3 +249,8 @@ - template.restrictedAccess.constructor = The constructor {0} is not accessible due to restriction on classpath entry {1} - template.restrictedAccess.field = The field {0} from the type {1} is not accessible due to restriction on classpath entry {2} - template.restrictedAccess.method = The method {0} from the type {1} is not accessible due to restriction on classpath entry {2} -+ -+# GCCMain messages. -+gcc.zipArg=-fzip-target requires argument -+gcc.zipDepArg=-fzip-dependency requires argument -+gcc.noClasspath=no classpath specified -Index: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java -=================================================================== -RCS file: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java -diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java 1 Jan 1970 00:00:00 -0000 +diff -urN org/eclipse/jdt/internal/compiler/batch/GCCMain.java org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java +--- org/eclipse/jdt/internal/compiler/batch/GCCMain.java 1970-01-01 01:00:00.000000000 +0100 ++++ org/eclipse/jdt/internal/compiler/batch/GCCMain.java 2007-03-03 19:55:20.000000000 +0100 @@ -0,0 +1,495 @@ +/** + * @@ -367,7 +348,7 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$ + } + this.destinationPath = arg; -+ // this.generatePackagesStructure = true; ++ this.generatePackagesStructure = true; + } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$ + classpath = getArgument(currentArg); + } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$ @@ -516,4 +497,15 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + System.exit(result ? 0 : 1); + } +} - +diff -urN org/eclipse/jdt/internal/compiler/batch/messages.properties org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/messages.properties +--- org/eclipse/jdt/internal/compiler/batch/messages.properties 2007-02-12 19:46:33.000000000 +0100 ++++ org/eclipse/jdt/internal/compiler/batch/messages.properties 2007-03-03 19:55:20.000000000 +0100 +@@ -249,3 +249,8 @@ + template.restrictedAccess.constructor = The constructor {0} is not accessible due to restriction on classpath entry {1} + template.restrictedAccess.field = The field {0} from the type {1} is not accessible due to restriction on classpath entry {2} + template.restrictedAccess.method = The method {0} from the type {1} is not accessible due to restriction on classpath entry {2} ++ ++# GCCMain messages. ++gcc.zipArg=-fzip-target requires argument ++gcc.zipDepArg=-fzip-dependency requires argument ++gcc.noClasspath=no classpath specified _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
