mirror of
https://git.freebsd.org/ports.git
synced 2025-07-15 16:29:15 -04:00
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:
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
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
PORTNAME= ecj-bootstrap
|
PORTNAME= ecj-bootstrap
|
||||||
PORTVERSION= 3.2
|
PORTVERSION= 3.2
|
||||||
|
PORTREVISION= 1
|
||||||
CATEGORIES= java devel
|
CATEGORIES= java devel
|
||||||
MASTER_SITES= ${MASTER_SITE_ECLIPSE:S,%SUBDIR%/,R-${PORTVERSION}-200606291905/,} \
|
MASTER_SITES= ${MASTER_SITE_ECLIPSE:S,%SUBDIR%/,R-${PORTVERSION}-200606291905/,} \
|
||||||
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,}
|
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,}
|
||||||
|
|
|
@ -5,13 +5,24 @@
|
||||||
# http://fedora.redhat.com/download/mirrors.html
|
# http://fedora.redhat.com/download/mirrors.html
|
||||||
|
|
||||||
# Bootstrapping is 3 parts:
|
# Bootstrapping is 3 parts:
|
||||||
|
# 0. Patch ecj.zip
|
||||||
# 1. Build ecj with gcj -C
|
# 1. Build ecj with gcj -C
|
||||||
# 2. Build ecj with gcj-built ecj ("javac")
|
# 2. Build ecj with gcj-built ecj ("javac")
|
||||||
# 3. Re-build ecj with output of 2.
|
# 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.
|
# Unzip the "stable compiler" source into a temp dir and build it.
|
||||||
# Note: we don't want to build the CompilerAdapter.
|
# Note: we don't want to build the CompilerAdapter.
|
||||||
|
|
||||||
|
rm -rf ecj-bootstrap-tmp
|
||||||
mkdir ecj-bootstrap-tmp
|
mkdir ecj-bootstrap-tmp
|
||||||
unzip -qq -d ecj-bootstrap-tmp jdtcoresrc/src/ecj.zip
|
unzip -qq -d ecj-bootstrap-tmp jdtcoresrc/src/ecj.zip
|
||||||
rm -f ecj-bootstrap-tmp/org/eclipse/jdt/core/JDTCompilerAdapter.java
|
rm -f ecj-bootstrap-tmp/org/eclipse/jdt/core/JDTCompilerAdapter.java
|
||||||
|
|
21
java/ecj-bootstrap/files/ecj-patch-Main.java
Normal file
21
java/ecj-bootstrap/files/ecj-patch-Main.java
Normal 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) {
|
Loading…
Add table
Reference in a new issue