------------------------------------------------------------
revno: 682
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk8
timestamp: Tue 2016-08-02 16:08:01 +0200
message:
* Fix JamVM, lacking JVM_GetResourceLookupCacheURLs (Xerxes Rånby).
Closes: #826206.
added:
debian/patches/pr2775-cache_api.diff
modified:
debian/changelog
debian/rules
--
lp:~openjdk/openjdk/openjdk8
https://code.launchpad.net/~openjdk/openjdk/openjdk8
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk8.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog 2016-08-02 11:25:41 +0000
+++ debian/changelog 2016-08-02 14:08:01 +0000
@@ -1,6 +1,8 @@
openjdk-8 (8u102-b14.1-2) UNRELEASED; urgency=medium
* Fix build failure with GCC 6. Closes: #811694.
+ * Fix JamVM, lacking JVM_GetResourceLookupCacheURLs (Xerxes Rånby).
+ Closes: #826206.
-- Matthias Klose <d...@ubuntu.com> Tue, 02 Aug 2016 13:24:46 +0200
=== added file 'debian/patches/pr2775-cache_api.diff'
--- debian/patches/pr2775-cache_api.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/pr2775-cache_api.diff 2016-08-02 14:08:01 +0000
@@ -0,0 +1,54 @@
+commit 25b39703b2c3468f666f6175ff94e46526d402a7
+Author: Xerxes Rånby <xer...@gudinna.com>
+Date: Tue Dec 22 13:33:44 2015 +0100
+
+ OpenJDK 8: Add JDK8u JDK-8061651 API. IcedTea PR2775.
+
+ Implement minimal JVM functionality to tell JDK8u that the JDK-8061651 API is unsupported by JamVM
+
+ JVM_GetResourceLookupCacheURLs
+ JVM_GetResourceLookupCache
+ JVM_KnownToNotExist
+
+ Signed-off-by: Xerxes Rånby <xer...@gudinna.com>
+
+diff --git a/src/classlib/openjdk/jvm.c b/src/classlib/openjdk/jvm.c
+index 971ac75..955621d 100644
+--- jamvm.old/jamvm/src/classlib/openjdk/jvm.c
++++ jamvm/jamvm/src/classlib/openjdk/jvm.c
+@@ -666,6 +666,35 @@ void JVM_SetClassSigners(JNIEnv *env, jclass cls, jobjectArray signers) {
+ }
+
+
++/* JVM_GetResourceLookupCacheURLs
++ is part of the
++ JDK-8061651 JDK8u API
++*/
++
++jobjectArray JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader) {
++ return NULL; // tell OpenJDK 8 that the lookup cache API is unavailable
++}
++
++/* JVM_GetResourceLookupCache
++ is unused however it is part of the
++ JDK-8061651 JDK8u API
++*/
++
++jintArray JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name) {
++ UNIMPLEMENTED("JVM_GetResourceLookupCache");
++ return NULL; // tell OpenJDK 8 that the lookup cache is unavailable
++}
++
++/* JVM_KnownToNotExist
++ is unused however it is part of the
++ JDK-8061651 JDK8u API
++*/
++
++jboolean JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname) {
++ UNIMPLEMENTED("JVM_KnownToNotExist");
++ return JNI_FALSE; // tell OpenJDK 8 we don't know whether it exists or not
++}
++
+ /* JVM_GetProtectionDomain */
+
+ jobject JVM_GetProtectionDomain(JNIEnv *env, jclass cls) {
=== modified file 'debian/rules'
--- debian/rules 2016-08-02 11:25:41 +0000
+++ debian/rules 2016-08-02 14:08:01 +0000
@@ -1160,6 +1160,7 @@
cp /usr/share/misc/config.* jamvm/.
patch -p1 < debian/patches/kfreebsd-support-jamvm.diff
patch -p1 < debian/patches/jamvm-fix.diff
+ patch -p1 < debian/patches/pr2775-cache_api.diff
@mkdir -p stamps
touch $@
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
