/hg/icedtea: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Apr 1 07:28:22 UTC 2016
changeset 548cabd036a9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=548cabd036a9
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 06:19:20 2016 +0100
PR2906: Support prefixed variants of GNU tools used on *BSD systems
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2906: Support prefixed variants of GNU
tools used on *BSD systems
* NEWS: Updated.
2014-04-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2906: Support prefixed variants of GNU
tools used on *BSD systems
* AUTHORS: Add Radim Kolar.
* acinclude.m4:
(IT_FIND_TOOL): Cleanup error message.
(IT_FIND_TOOLS): Likewise.
2014-03-20 Radim Kolar <hsn at sanatana.filez.com>
PR2906: Support prefixed variants of GNU
tools used on *BSD systems
* Makefile.am:
(versioning): Use $(SED) instead of 'sed'.
(icedtea): Likewise.
(icedtea-debug): Likewise.
(clean-add-jamvm): Likewise.
(clean-add-jamvm-debug): Likewise.
(clean-add-cacao): Likewise.
(clean-add-cacao-debug): Likewise.
(clean-add-zero): Likewise.
(clean-add-zero-debug): Likewise.
(jtreg_processes): Likewise.
* acinclude.m4:
(IT_FIND_TOOLS): New macro to check for
multiple tools.
* configure.ac: Check for gmake, gfind, gpatch, gtar,
gsha256sum and gsed (GNU tools on *BSD). Use
IT_FIND_TOOLS for fastjar.
changeset 6749369df844 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6749369df844
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 06:28:16 2016 +0100
PR2907: Replace --with-abs-install-dir with usual --prefix
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2907: Replace --with-abs-install-dir
with usual --prefix
* NEWS: Updated.
2014-06-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2907: Replace --with-abs-install-dir
with usual --prefix
* INSTALL: Replace documentation of
--with-abs-install-dir with --prefix. Fix typo.
* Makefile.am:
(ICEDTEA_ENV): Set INSTALL_LOCATION to prefix.
* configure.ac: Drop abs-install-dir
option and use prefix in ABS_CLIENT_LIBJVM_SO and
ABS_SERVER_LIBJVM_SO instead.
* tapset/hotspot.stp.in,
* tapset/hotspot_jni.stp.in,
* tapset/jstack.stp.in:
Replace ABS_JAVA_HOME_DIR with prefix.
changeset a2e2736b29fd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a2e2736b29fd
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 07:32:24 2016 +0100
PR2909: Install CACAO in same way as JamVM
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2909: Install CACAO in same way as JamVM
* Makefile.am:
(cacao-install): Perform same operations as
in jamvm-install.
* NEWS: Updated.
* acinclude.m4:
(IT_WITH_CACAO_HOME): Use a clean subdirectory for
the OpenJDK-style VM import, as JamVM does.
changeset d4666165e486 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d4666165e486
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 08:28:03 2016 +0100
PR2908: Add missing functions for CACAO OpenJDK JVM implementation
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2908: Add missing functions for CACAO
OpenJDK JVM implementation
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/cacao/pr2908-missing_functions.patch:
Provide stubs for JVM_GetClassTypeAnnotations,
JVM_GetFieldTypeAnnotations, JVM_GetMethodParameters,
JVM_GetMethodTypeAnnotations and JVM_IsVMGeneratedMethodIx.
diffstat:
AUTHORS | 1 +
ChangeLog | 82 ++++++++++++++++++
INSTALL | 4 +-
Makefile.am | 51 ++++++-----
NEWS | 4 +
acinclude.m4 | 12 ++-
configure.ac | 32 ++-----
patches/cacao/pr2908-missing_functions.patch | 117 +++++++++++++++++++++++++++
tapset/hotspot.stp.in | 2 +-
tapset/hotspot_jni.stp.in | 2 +-
tapset/jstack.stp.in | 2 +-
11 files changed, 256 insertions(+), 53 deletions(-)
diffs (truncated from 545 to 500 lines):
diff -r 226896a30232 -r d4666165e486 AUTHORS
--- a/AUTHORS Fri Apr 01 05:29:22 2016 +0100
+++ b/AUTHORS Fri Apr 01 08:28:03 2016 +0100
@@ -19,6 +19,7 @@
Andrew John Hughes <gnu_andrew at member.fsf.org, gnu.andrew at redhat.com>
Tomas Hurka <tomas.hurka at sun.com>
Ioana Ivan <iivan at redhat.com>
+Radim Kolar <hsn at sanatana.filez.com>
Matthias Klose <doko at ubuntu.com>
Francis Kung <fkung at redhat.com>
DJ Lucas <dj at linuxfromscratch.org>
diff -r 226896a30232 -r d4666165e486 ChangeLog
--- a/ChangeLog Fri Apr 01 05:29:22 2016 +0100
+++ b/ChangeLog Fri Apr 01 08:28:03 2016 +0100
@@ -1,3 +1,85 @@
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2908: Add missing functions for CACAO
+ OpenJDK JVM implementation
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/cacao/pr2908-missing_functions.patch:
+ Provide stubs for JVM_GetClassTypeAnnotations,
+ JVM_GetFieldTypeAnnotations, JVM_GetMethodParameters,
+ JVM_GetMethodTypeAnnotations and JVM_IsVMGeneratedMethodIx.
+
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2909: Install CACAO in same way as JamVM
+ * Makefile.am:
+ (cacao-install): Perform same operations as
+ in jamvm-install.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_WITH_CACAO_HOME): Use a clean subdirectory for
+ the OpenJDK-style VM import, as JamVM does.
+
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2907: Replace --with-abs-install-dir
+ with usual --prefix
+ * NEWS: Updated.
+
+2014-06-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2907: Replace --with-abs-install-dir
+ with usual --prefix
+ * INSTALL: Replace documentation of
+ --with-abs-install-dir with --prefix. Fix typo.
+ * Makefile.am:
+ (ICEDTEA_ENV): Set INSTALL_LOCATION to prefix.
+ * configure.ac: Drop abs-install-dir
+ option and use prefix in ABS_CLIENT_LIBJVM_SO and
+ ABS_SERVER_LIBJVM_SO instead.
+ * tapset/hotspot.stp.in,
+ * tapset/hotspot_jni.stp.in,
+ * tapset/jstack.stp.in:
+ Replace ABS_JAVA_HOME_DIR with prefix.
+
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2906: Support prefixed variants of GNU
+ tools used on *BSD systems
+ * NEWS: Updated.
+
+2014-04-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2906: Support prefixed variants of GNU
+ tools used on *BSD systems
+ * AUTHORS: Add Radim Kolar.
+ * acinclude.m4:
+ (IT_FIND_TOOL): Cleanup error message.
+ (IT_FIND_TOOLS): Likewise.
+
+2014-03-20 Radim Kolar <hsn at sanatana.filez.com>
+
+ PR2906: Support prefixed variants of GNU
+ tools used on *BSD systems
+ * Makefile.am:
+ (versioning): Use $(SED) instead of 'sed'.
+ (icedtea): Likewise.
+ (icedtea-debug): Likewise.
+ (clean-add-jamvm): Likewise.
+ (clean-add-jamvm-debug): Likewise.
+ (clean-add-cacao): Likewise.
+ (clean-add-cacao-debug): Likewise.
+ (clean-add-zero): Likewise.
+ (clean-add-zero-debug): Likewise.
+ (jtreg_processes): Likewise.
+ * acinclude.m4:
+ (IT_FIND_TOOLS): New macro to check for
+ multiple tools.
+ * configure.ac: Check for gmake, gfind, gpatch, gtar,
+ gsha256sum and gsed (GNU tools on *BSD). Use
+ IT_FIND_TOOLS for fastjar.
+
2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2832, CA195: typeinfo.cpp: typeinfo_merge_nonarrays:
diff -r 226896a30232 -r d4666165e486 INSTALL
--- a/INSTALL Fri Apr 01 05:29:22 2016 +0100
+++ b/INSTALL Fri Apr 01 08:28:03 2016 +0100
@@ -68,7 +68,7 @@
There is currently no install target. IcedTea ends up in
openjdk.build when the build completes.
-Most targets in IcedTea creat stamp files in the stamps directory to
+Most targets in IcedTea create stamp files in the stamps directory to
determine what and when dependencies were compiled. Each target has a
corresponding clean-x target which removes the output and the stamp
file, allowing it to be rebuilt. For example, stamps/rt.stamp (alias
@@ -81,6 +81,7 @@
The build process may be modified by passing the following options
to configure:
+* --prefix: The final install location of the j2sdk-image.
* --disable-docs: Don't build the Javadoc documentation.
* --disable-bootstrap: Perform a quick (no bootstrap) build using an installed
copy of IcedTea6 or IcedTea7. If a directory is not specified, a check against
@@ -186,7 +187,6 @@
--with-jamvm-src-zip at all. This option allows a locally modified version of the source
tarball to be used instead of the standard versions.
* --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option.
-* --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
* --with-llvm-config: Specify the location of the llvm-config binary.
* --with-version-suffix: Appends the given text to the JDK version output.
* --with-cacerts-file: Specify the location of a cacerts file, defaulting to
diff -r 226896a30232 -r d4666165e486 Makefile.am
--- a/Makefile.am Fri Apr 01 05:29:22 2016 +0100
+++ b/Makefile.am Fri Apr 01 08:28:03 2016 +0100
@@ -350,7 +350,8 @@
patches/cacao/pr2035-tempdir.patch \
patches/cacao/pr2349.patch \
patches/cacao/pr2776-cache_api.patch \
- patches/cacao/pr2832-refactoring_error.patch
+ patches/cacao/pr2832-refactoring_error.patch \
+ patches/cacao/pr2908-missing_functions.patch
else
if USING_CACAO
ICEDTEA_PATCHES +=
@@ -529,7 +530,8 @@
DEBUG_BINARIES="true" \
LOG="debug" SCTP_WERROR= \
POST_STRIP_CMD= STRIP_POLICY="no_strip" \
- JOBS="$(PARALLEL_JOBS)"
+ JOBS="$(PARALLEL_JOBS)" \
+ INSTALL_LOCATION="${prefix}"
if DISABLE_OPTIMIZATIONS
ICEDTEA_ENV += \
@@ -1609,7 +1611,7 @@
if test x"$(VERSION_SUFFIX)" != "x"; then \
ver_suffix="-$(VERSION_SUFFIX)"; \
fi ; \
- sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
+ $(SED) -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
$(VERSION_SETTINGS_FILE);
mkdir -p stamps
touch $@
@@ -1824,13 +1826,13 @@
mkdir -p $(BUILD_SDK_DIR)/tapset ; \
grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
if test $$? -eq 0; then \
- sed -e '/\/client\/libjvm.so/d' \
+ $(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot.stp \
> $(BUILD_SDK_DIR)/tapset/hotspot.stp; \
- sed -e '/\/client\/libjvm.so/d' \
+ $(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_jni.stp \
> $(BUILD_SDK_DIR)/tapset/hotspot_jni.stp; \
- sed -e '/\/client\/libjvm.so/d' \
+ $(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_gc.stp \
> $(BUILD_SDK_DIR)/tapset/hotspot_gc.stp; \
else \
@@ -1886,13 +1888,13 @@
mkdir -p $(BUILD_DEBUG_SDK_DIR)/tapset ; \
grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
if test $$? -eq 0; then \
- sed -e '/\/client\/libjvm.so/d' \
+ $(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot.stp \
> $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot.stp; \
- sed -e '/\/client\/libjvm.so/d' \
+ $(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_jni.stp \
> $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_jni.stp; \
- sed -e '/\/client\/libjvm.so/d' \
+ $(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_gc.stp \
> $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_gc.stp; \
else \
@@ -2157,7 +2159,7 @@
clean-add-jamvm:
rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm
if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \
- sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+ $(SED) -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
fi
rm -f stamps/add-jamvm.stamp
@@ -2175,7 +2177,7 @@
clean-add-jamvm-debug:
rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm
if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
- sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+ $(SED) -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
fi
rm -f stamps/add-jamvm-debug.stamp
@@ -2222,11 +2224,14 @@
if !USE_SYSTEM_CACAO
cd cacao/cacao.build && \
$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
- mkdir -p $(abs_top_builddir)/cacao/install/lib
- touch $(abs_top_builddir)/cacao/install/lib/sa-jdi.jar
- ln -sf server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
- touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
- ln -sf client/libjvm.so $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
+ mkdir -p $(abs_top_builddir)/cacao/install/hotspot/lib
+ touch $(abs_top_builddir)/cacao/install/hotspot/lib/sa-jdi.jar
+ mkdir -p $(abs_top_builddir)/cacao/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
+ cp $(abs_top_builddir)/cacao/install/lib/libjvm.so \
+ $(abs_top_builddir)/cacao/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
+ ln -sf server $(abs_top_builddir)/cacao/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
+ touch $(abs_top_builddir)/cacao/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
+ ln -sf libjvm.so $(abs_top_builddir)/cacao/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client/libjsig.so
endif
endif
mkdir -p stamps
@@ -2257,7 +2262,7 @@
clean-add-cacao:
rm -rf $(BUILD_JRE_ARCH_DIR)/cacao
if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \
- sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+ $(SED) -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
fi
rm -f stamps/add-cacao.stamp
@@ -2279,7 +2284,7 @@
clean-add-cacao-debug:
rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
- sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+ $(SED) -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
fi
rm -f stamps/add-cacao-debug.stamp
@@ -2347,8 +2352,8 @@
rm -rf $(BUILD_JRE_ARCH_DIR)/shark
rm -rf zerovm
if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \
- sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
- sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+ $(SED) -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+ $(SED) -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
fi
rm -f stamps/add-zero.stamp
@@ -2386,8 +2391,8 @@
rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/shark
rm -rf zerovm
if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
- sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
- sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+ $(SED) -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+ $(SED) -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
fi
rm -f stamps/add-zero-debug.stamp
@@ -2465,7 +2470,7 @@
# FIXME: this might need some adjustment for other OS than Linux
jtreg_processes = ps x -ww -o pid,ppid,args \
| awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,/scratch)/' \
- | sed 's,$(CURDIR)/$(sdkimg),<sdkimg>,g;s,$(CURDIR),<pwd>,g'
+ | $(SED) 's,$(CURDIR)/$(sdkimg),<sdkimg>,g;s,$(CURDIR),<pwd>,g'
jtreg_pids = ps x --no-headers -ww -o pid,ppid,args \
| awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,$(CURDIR)/$(sdkimg))/ {print $$1}'
diff -r 226896a30232 -r d4666165e486 NEWS
--- a/NEWS Fri Apr 01 05:29:22 2016 +0100
+++ b/NEWS Fri Apr 01 08:28:03 2016 +0100
@@ -159,6 +159,8 @@
- PR2873: Fix make distcheck.
- PR2880: Add missing test directory in make check.
- PR2885: Location of 'stap' executable is hard-coded
+ - PR2906: Support prefixed variants of GNU tools used on *BSD systems
+ - PR2907: Replace --with-abs-install-dir with usual --prefix
- Don't substitute 'j' for '-j' inside -I directives
- Extend 8041658 to all files in the HotSpot build.
- Remove jcheck
@@ -208,6 +210,8 @@
- PR2355: CACAO build fails to use JRE layout
- PR2776: CACAO lacks JVM_GetResourceLookupCacheURLs introduced by jdk8u40
- PR2832, CA195: typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed
+ - PR2908: Add missing functions for CACAO OpenJDK JVM implementation
+ - PR2909: Install CACAO in same way as JamVM
New in release 2.6.3 (2015-11-13):
diff -r 226896a30232 -r d4666165e486 acinclude.m4
--- a/acinclude.m4 Fri Apr 01 05:29:22 2016 +0100
+++ b/acinclude.m4 Fri Apr 01 08:28:03 2016 +0100
@@ -610,7 +610,15 @@
AC_DEFUN([IT_FIND_TOOL],
[AC_PATH_TOOL([$1],[$2])
if test x"$$1" = x ; then
- AC_MSG_ERROR([$2 program not found in PATH])
+ AC_MSG_ERROR([The following program was not found on the PATH: $2])
+ fi
+ AC_SUBST([$1])
+])
+
+AC_DEFUN([IT_FIND_TOOLS],
+[AC_PATH_PROGS([$1],[$2])
+ if test x"$$1" = x ; then
+ AC_MSG_ERROR([None of the following programs could be found on the PATH: $2])
fi
AC_SUBST([$1])
])
@@ -746,7 +754,7 @@
AM_CONDITIONAL(USE_SYSTEM_CACAO, true)
],
[
- CACAO_IMPORT_PATH="\$(abs_top_builddir)/cacao/install"
+ CACAO_IMPORT_PATH="\$(abs_top_builddir)/cacao/install/hotspot"
AM_CONDITIONAL(USE_SYSTEM_CACAO, false)
])
AC_MSG_RESULT(${CACAO_IMPORT_PATH})
diff -r 226896a30232 -r d4666165e486 configure.ac
--- a/configure.ac Fri Apr 01 05:29:22 2016 +0100
+++ b/configure.ac Fri Apr 01 08:28:03 2016 +0100
@@ -22,24 +22,21 @@
AC_PROG_CC
AC_PROG_CXX
-IT_FIND_TOOL([MAKE], [make])
+IT_FIND_TOOLS([MAKE], [gmake make])
IT_FIND_TOOL([GZIP], [gzip])
-IT_FIND_TOOL([FIND], [find])
-IT_FIND_TOOL([PATCH], [patch])
-IT_FIND_TOOL([TAR], [tar])
+IT_FIND_TOOLS([FIND], [gfind find])
+IT_FIND_TOOLS([PATCH], [gpatch patch])
+IT_FIND_TOOLS([TAR], [gtar tar])
IT_FIND_TOOL([CHMOD], [chmod])
-IT_FIND_TOOL([SHA256SUM], [sha256sum])
+IT_FIND_TOOLS([SHA256SUM], [gsha256sum sha256sum])
IT_FIND_TOOL([WGET], [wget])
IT_FIND_TOOL([ZIP], [zip])
IT_FIND_TOOL([UNZIP], [unzip])
IT_FIND_TOOL([CPIO], [cpio])
IT_FIND_TOOL([FILE], [file])
IT_FIND_TOOL([READLINK], [readlink])
-AC_CHECK_TOOLS([FASTJAR], [fastjar jar])
-if test "x$FASTJAR" = x; then
- AC_MSG_ERROR([Can't find fastjar or jar])
-fi
-AC_SUBST([FASTJAR])
+IT_FIND_TOOLS([FASTJAR], [fastjar jar])
+IT_FIND_TOOLS([SED],[gsed sed])
AC_CHECK_TOOL([LDD], [ldd])
dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
dnl check for it explicitly rather than using AC_PROG_AWK.
@@ -259,19 +256,8 @@
AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$SDT_H_FOUND = xyes])
-AC_MSG_CHECKING([for absolute java home install dir])
-AC_ARG_WITH([abs-install-dir],
- [AS_HELP_STRING([--with-abs-install-dir],
- [The absolute path where the j2sdk-image dir will be installed])],
- [if test "x${withval}" = x; then
- ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"
- else
- ABS_JAVA_HOME_DIR="${withval}"
- fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"])
-AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}])
-ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so"
-ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so"
-AC_SUBST(ABS_JAVA_HOME_DIR)
+ABS_CLIENT_LIBJVM_SO="${prefix}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so"
+ABS_SERVER_LIBJVM_SO="${prefix}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so"
AC_SUBST(ABS_CLIENT_LIBJVM_SO)
AC_SUBST(ABS_SERVER_LIBJVM_SO)
AC_CONFIG_FILES([tapset/hotspot.stp])
diff -r 226896a30232 -r d4666165e486 patches/cacao/pr2908-missing_functions.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2908-missing_functions.patch Fri Apr 01 08:28:03 2016 +0100
@@ -0,0 +1,117 @@
+diff -Nru cacao.old/cacao/contrib/mapfile-vers-product cacao/cacao/contrib/mapfile-vers-product
+--- cacao.old/cacao/contrib/mapfile-vers-product 2016-04-01 08:07:33.021538925 +0100
++++ cacao/cacao/contrib/mapfile-vers-product 2016-04-01 08:08:19.576767011 +0100
+@@ -127,12 +127,14 @@
+ JVM_GetClassNameUTF;
+ JVM_GetClassSignature;
+ JVM_GetClassSigners;
++ JVM_GetClassTypeAnnotations;
+ JVM_GetComponentType;
+ JVM_GetDeclaredClasses;
+ JVM_GetDeclaringClass;
+ JVM_GetEnclosingMethodInfo;
+ JVM_GetFieldAnnotations;
+ JVM_GetFieldIxModifiers;
++ JVM_GetFieldTypeAnnotations;
+ JVM_GetHostName;
+ JVM_GetInheritedAccessControlContext;
+ JVM_GetInterfaceVersion;
+@@ -153,6 +155,8 @@
+ JVM_GetMethodIxNameUTF;
+ JVM_GetMethodIxSignatureUTF;
+ JVM_GetMethodParameterAnnotations;
++ JVM_GetMethodParameters;
++ JVM_GetMethodTypeAnnotations;
+ JVM_GetResourceLookupCacheURLs;
+ JVM_GetResourceLookupCache;
+ JVM_GetPrimitiveArrayElement;
+@@ -180,6 +184,7 @@
+ JVM_InvokeMethod;
+ JVM_IsArrayClass;
+ JVM_IsConstructorIx;
++ JVM_IsVMGeneratedMethodIx;
+ JVM_IsInterface;
+ JVM_IsInterrupted;
+ JVM_IsNaN;
+diff -Nru cacao.old/cacao/src/native/vm/openjdk/jvm.cpp cacao/cacao/src/native/vm/openjdk/jvm.cpp
+--- cacao.old/cacao/src/native/vm/openjdk/jvm.cpp 2016-04-01 08:07:21.685726880 +0100
++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2016-04-01 08:08:01.225071294 +0100
+@@ -1110,6 +1110,15 @@
+ return (jbyteArray) annotations;
+ }
+
++/* JVM_GetClassTypeAnnotations */
++
++jbyteArray JVM_GetClassTypeAnnotations(JNIEnv *env, jclass cls)
++{
++ TRACEJVMCALLS(("JVM_GetClassAnnotations(env=%p, cls=%p)", env, cls));
++
++ log_println("JVM_GetClassTypeAnnotations: IMPLEMENT ME!");
++ return NULL;
++}
+
+ /* JVM_GetFieldAnnotations */
+
+@@ -1127,6 +1136,16 @@
+ return (jbyteArray) jlrf.get_annotations();
+ }
+
++/* JVM_GetFieldTypeAnnotations */
++
++jbyteArray JVM_GetFieldTypeAnnotations(JNIEnv *env, jobject field)
++{
++ TRACEJVMCALLS(("JVM_GetFieldTypeAnnotations(env=%p, field=%p)", env, field));
++
++ log_println("JVM_GetFieldTypeAnnotations: IMPLEMENT ME!");
++ return NULL;
++}
++
+
+ /* JVM_GetMethodAnnotations */
+
+@@ -1144,6 +1163,15 @@
+ return (jbyteArray) jlrm.get_annotations();
+ }
+
++/* JVM_GetMethodTypeAnnotations */
++
++jbyteArray JVM_GetMethodTypeAnnotations(JNIEnv *env, jobject method)
++{
++ TRACEJVMCALLS(("JVM_GetMethodTypeAnnotations(env=%p, method=%p)", env, method));
++
++ log_println("JVM_GetMethodTypeAnnotations: IMPLEMENT ME!");
++ return NULL;
++}
+
+ /* JVM_GetMethodDefaultAnnotationValue */
+
+@@ -1178,6 +1206,14 @@
+ return (jbyteArray) jlrm.get_parameterAnnotations();
+ }
+
++/* JVM_GetMethodParameters */
++
++jbyteArray JVM_GetMethodParameters(JNIEnv *env, jobject method) {
++ TRACEJVMCALLS(("JVM_GetMethodParameters(env=%p, method=%p)", env, method));
++
++ log_println("JVM_GetMethodParameters: IMPLEMENT ME!");
++ return NULL;
++}
+
+ /* JVM_GetClassDeclaredFields */
+
+@@ -1864,6 +1900,14 @@
+ return 0;
+ }
+
++/* JVM_IsVMGeneratedMethodIx */
++
More information about the distro-pkg-dev
mailing list