Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d6e897db52af1b53b8749e16cefdf5f2d6982bd3
commit d6e897db52af1b53b8749e16cefdf5f2d6982bd3 Author: Miklos Vajna <[email protected]> Date: Tue Aug 17 13:45:29 2010 +0200 ecj-3.5.1-2-ppc - disable gcj on ppc diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index b00126b..e4c7cd1 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -50,6 +50,10 @@ build() xargs fastjar cf eclipse-ecj.jar Ffilerel /usr/share/java/eclipse-ecj.jar + + # oom would just kill it + [ "$CARCH" == "ppc" ] && _F_java_no_gcj=1 + Fgcj org.eclipse.jdt.internal.compiler.batch.Main $Fdestdir/usr/bin/ecj \ $Fdestdir/usr/share/java/eclipse-ecj.jar } diff --git a/source/include/java.sh b/source/include/java.sh index 2dc7237..7bef488 100644 --- a/source/include/java.sh +++ b/source/include/java.sh @@ -43,6 +43,7 @@ # you really need (for bootstrapping) some binary jars. # * _F_java_jars: a bash array to specify what jars to install using Fjar in # Fmakeinstall if build.xml found +# * _F_java_no_gcj: use Fwrapper in Fgcj(), it is useful on low memory boxes ### if [ -z "$_F_java_cflags" ]; then _F_java_cflags="-fPIC -findirect-dispatch -fjni" @@ -84,8 +85,12 @@ Fgcj() if [ ! -d "`dirname $output`" ]; then mkdir -p "`dirname $output`" || Fdie fi - Fexec gcj ${CFLAGS/O2/O0} ${_F_java_cflags/-fPIC } $_F_java_ldflags \ - --main=$main -o $output $@ || Fdie + if [ -z "$_F_java_no_gcj" ]; then + Fexec gcj ${CFLAGS/O2/O0} ${_F_java_cflags/-fPIC } $_F_java_ldflags \ + --main=$main -o $output $@ || Fdie + else + Fwrapper "gij -cp $(echo $@|sed "s|$Fdestdir||") $main \"\...@\"" $(basename $output) + fi } ### _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
