svn commit: r331195 - in head/java/bootstrap-openjdk: . files
Jung-uk Kim
jkim at FreeBSD.org
Mon Oct 21 21:28:00 UTC 2013
Author: jkim
Date: Mon Oct 21 21:27:59 2013
New Revision: 331195
URL: http://svnweb.freebsd.org/changeset/ports/331195
Log:
- Update to r330538.
- Turn off mixed mode for HotSpot (i. e., JIT compiler) by default for
extreme safety. Although it may be too conservative and/or slow, it is okay
because it is not useful for anything but bootstrapping OpenJDK itself. In
fact, it does not seem stable within jails (e. g., QAT) for unknown reasons.
- Revert r330422. Now it is obsolete by r330500.
Added:
head/java/bootstrap-openjdk/files/
head/java/bootstrap-openjdk/files/bootstrap.patch (contents, props changed)
Modified:
head/java/bootstrap-openjdk/Makefile
head/java/bootstrap-openjdk/Makefile.update
head/java/bootstrap-openjdk/distinfo.amd64
head/java/bootstrap-openjdk/distinfo.i386
Modified: head/java/bootstrap-openjdk/Makefile
==============================================================================
--- head/java/bootstrap-openjdk/Makefile Mon Oct 21 21:23:34 2013 (r331194)
+++ head/java/bootstrap-openjdk/Makefile Mon Oct 21 21:27:59 2013 (r331195)
@@ -18,8 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/java/zi:
ONLY_FOR_ARCH= amd64 i386
DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH}
-DISTVERSION_amd64= r330107
-DISTVERSION_i386= r330107
+DISTVERSION_amd64= r330538
+DISTVERSION_i386= r330538
JDK_NAME= openjdk
JDK_PORT= openjdk6
@@ -37,9 +37,6 @@ INSTALLDIR= ${STAGEDIR}${PREFIX}/${JDK_R
.if ${OSVERSION} >= 900010
RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libz.so.5:${PORTSDIR}/misc/compat8x
.endif
-.if ${OSVERSION} >= 1000054
-RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
-.endif
.if ${ARCH} == "i386"
PLIST_SUB+= CLIENTVM=""
Modified: head/java/bootstrap-openjdk/Makefile.update
==============================================================================
--- head/java/bootstrap-openjdk/Makefile.update Mon Oct 21 21:23:34 2013 (r331194)
+++ head/java/bootstrap-openjdk/Makefile.update Mon Oct 21 21:27:59 2013 (r331195)
@@ -32,6 +32,7 @@ PORTREVISION!= ${GET_REVISION} 2>/dev/nu
DISTDIR?= ${.CURDIR}
DISTFILE= ${JDK_PORT}-${ARCH}-r${PORTREVISION}.tar.xz
DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH}
+EXTRA_PATCHES= ${.CURDIR}/files/bootstrap.patch
MAKEFILE= ${.CURDIR}/Makefile
PLIST?= ${.CURDIR}/pkg-plist
PLIST_SUB= ARCH="${ARCH}" JDK_ROOT="."
@@ -60,7 +61,9 @@ all:
@${ECHO} "=============================================================="
@${ECHO} ""
.if !defined(NO_BUILD)
- @${SETENV} -i PATH=${PATH} ${MAKE} -C "${JDK_PORTDIR}" BATCH=yes
+ @${SETENV} -i PATH=${PATH} __MAKE_CONF=/dev/null \
+ ${MAKE} -C "${JDK_PORTDIR}" BATCH=yes EXTRA_PATCHES="${EXTRA_PATCHES}" \
+ PORT_DBDIR=/var/empty WITHOUT_ICEDTEA=yes
.endif
@cd "${JDK_IMAGEDIR}" && \
${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} | \
Modified: head/java/bootstrap-openjdk/distinfo.amd64
==============================================================================
--- head/java/bootstrap-openjdk/distinfo.amd64 Mon Oct 21 21:23:34 2013 (r331194)
+++ head/java/bootstrap-openjdk/distinfo.amd64 Mon Oct 21 21:27:59 2013 (r331195)
@@ -1,2 +1,2 @@
-SHA256 (openjdk6-amd64-r330107.tar.xz) = 18ff0c050d02670ae3202f514d1f8619485d44f7d1be4d004d207fa5ce890766
-SIZE (openjdk6-amd64-r330107.tar.xz) = 22387200
+SHA256 (openjdk6-amd64-r330538.tar.xz) = f1ba1aca887d26f3ce067c9d95e8e51294a28de643ea0d6593ed285b6cf1202b
+SIZE (openjdk6-amd64-r330538.tar.xz) = 22382548
Modified: head/java/bootstrap-openjdk/distinfo.i386
==============================================================================
--- head/java/bootstrap-openjdk/distinfo.i386 Mon Oct 21 21:23:34 2013 (r331194)
+++ head/java/bootstrap-openjdk/distinfo.i386 Mon Oct 21 21:27:59 2013 (r331195)
@@ -1,2 +1,2 @@
-SHA256 (openjdk6-i386-r330107.tar.xz) = 90e3f9d3efb9b2b259ee224ed2f81b2a33dddcaf0dd4ca8950e28be8be66d280
-SIZE (openjdk6-i386-r330107.tar.xz) = 22676896
+SHA256 (openjdk6-i386-r330538.tar.xz) = 034d986e077ba33e235647fbc86d3b9e387fe88885897ee83c3df28922c85daa
+SIZE (openjdk6-i386-r330538.tar.xz) = 22677180
Added: head/java/bootstrap-openjdk/files/bootstrap.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/bootstrap-openjdk/files/bootstrap.patch Mon Oct 21 21:27:59 2013 (r331195)
@@ -0,0 +1,45 @@
+--- hotspot/src/share/vm/Xusage.txt
++++ hotspot/src/share/vm/Xusage.txt
+@@ -1,5 +1,5 @@
+- -Xmixed mixed mode execution (default)
+- -Xint interpreted mode execution only
++ -Xint interpreted mode execution only (default)
++ -Xmixed mixed mode execution
+ -Xbootclasspath:<directories and zip/jar files separated by ;>
+ set search path for bootstrap classes and resources
+ -Xbootclasspath/a:<directories and zip/jar files separated by ;>
+--- hotspot/src/share/vm/runtime/arguments.cpp
++++ hotspot/src/share/vm/runtime/arguments.cpp
+@@ -67,7 +67,7 @@
+ bool Arguments::_has_profile = false;
+ bool Arguments::_has_alloc_profile = false;
+ uintx Arguments::_min_heap_size = 0;
+-Arguments::Mode Arguments::_mode = _mixed;
++Arguments::Mode Arguments::_mode = _int;
+ bool Arguments::_java_compiler = false;
+ bool Arguments::_xdebug_mode = false;
+ const char* Arguments::_java_vendor_url_bug = DEFAULT_VENDOR_URL_BUG;
+@@ -2036,8 +2036,8 @@
+ Arguments::_ClipInlining = ClipInlining;
+ Arguments::_BackgroundCompilation = BackgroundCompilation;
+
+- // Setup flags for mixed which is the default
+- set_mode_flags(_mixed);
++ // Setup flags for interpreter which is the default
++ set_mode_flags(_int);
+
+ // Parse JAVA_TOOL_OPTIONS environment variable (if present)
+ jint result = parse_java_tool_options_environment_variable(&scp, &scp_assembly_required);
+--- jdk/src/share/classes/sun/launcher/resources/launcher.properties
++++ jdk/src/share/classes/sun/launcher/resources/launcher.properties
+@@ -75,8 +75,8 @@
+
+ # Translators please note do not translate the options themselves
+ java.launcher.X.usage=\
+-\ -Xmixed mixed mode execution (default)\n\
+-\ -Xint interpreted mode execution only\n\
++\ -Xint interpreted mode execution only (default)\n\
++\ -Xmixed mixed mode execution\n\
+ \ -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\
+ \ set search path for bootstrap classes and resources\n\
+ \ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\
More information about the svn-ports-all
mailing list