Add sun.boot.class.path as default bootclasspath for gcj,

so that we don't need to specify the bootclasspath.
Bump portrevision.
This commit is contained in:
Maho Nakata 2006-08-04 10:34:49 +00:00
parent e0bbae65a0
commit c237f6edac
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=169640
3 changed files with 34 additions and 1 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= ecj-bootstrap
PORTVERSION= 3.2
PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_ECLIPSE:S,%SUBDIR%/,R-${PORTVERSION}-200606291905/,} \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,}

View file

@ -5,13 +5,24 @@
# http://fedora.redhat.com/download/mirrors.html
# Bootstrapping is 3 parts:
# 0. Patch ecj.zip
# 1. Build ecj with gcj -C
# 2. Build ecj with gcj-built ecj ("javac")
# 3. Re-build ecj with output of 2.
# Patch ecj.zip first
rm -rf tmp
mkdir tmp
unzip -qq -d tmp jdtcoresrc/src/ecj.zip
cd tmp
patch < ../../files/ecj-patch-Main.java
zip -r ../jdtcoresrc/src/ecj.zip *
cd ..
# Unzip the "stable compiler" source into a temp dir and build it.
# Note: we don't want to build the CompilerAdapter.
rm -rf ecj-bootstrap-tmp
mkdir ecj-bootstrap-tmp
unzip -qq -d ecj-bootstrap-tmp jdtcoresrc/src/ecj.zip
rm -f ecj-bootstrap-tmp/org/eclipse/jdt/core/JDTCompilerAdapter.java

View file

@ -0,0 +1,21 @@
Dirty hack...recognize sun.boot.class.path for implicit bootclasspath.
--- org/eclipse/jdt/internal/compiler/batch/Main.java Fri Aug 4 15:14:29 2006
+++ org/eclipse/jdt/internal/compiler/batch/Main.java Fri Aug 4 16:04:13 2006
@@ -2448,6 +2448,16 @@
}
}
}
+
+ /*
+ * Handle sun.boot.class.path
+ */
+ String sunboot = System.getProperty("sun.boot.class.path");
+ File sunbootclasspath = new File (sunboot);
+ FileSystem.Classpath classpath = FileSystem.getClasspath(
+ sunbootclasspath.getAbsolutePath(),
+ null, false, null);
+ if (classpath != null) {bootclasspaths.add(classpath);}
}
final int classpathsSize = classpaths.size();
if (classpaths.size() != 0) {