Bug#893833: openjdk-10: Please drop obsolete patch hotspot-disable-jvmtihtml.diff
Source: openjdk-10
Version: 10~46-2
Severity: normal
Tags: patch
User: debian-68k@lists.debian.org
Usertags: m68k
Hi!
The patch hotspot-disable-jvmtihtml.diff doesn't apply anymore,
please remove it completely. It also seems we don't need it
anymore at all, but I am checking openjdk-10 (and -11) on m68k
now to see whether we need another patch. I will open another bug
report for that if necessary.
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz@debian.org
`. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
diff -Nru old/openjdk-10-10~46/debian/patches/hotspot-disable-jvmtihtml.diff new/openjdk-10-10~46/debian/patches/hotspot-disable-jvmtihtml.diff
--- old/openjdk-10-10~46/debian/patches/hotspot-disable-jvmtihtml.diff 2017-11-19 14:58:26.000000000 +0100
+++ new/openjdk-10-10~46/debian/patches/hotspot-disable-jvmtihtml.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- a/src/hotspot/make/gensrc/GensrcJvmti.gmk.orig 2017-05-11 14:11:42.000000000 +0200
-+++ b/src/hotspot/make/gensrc/GensrcJvmti.gmk 2017-06-06 16:38:26.990673621 +0200
-@@ -103,7 +103,6 @@
- -PARAM interface jvmti -PARAM trace Trace))
- $(eval $(call SetupJvmtiGeneration, jvmtiEnv.hpp, jvmtiHpp.xsl))
- $(eval $(call SetupJvmtiGeneration, jvmti.h, jvmtiH.xsl))
--$(eval $(call SetupJvmtiGeneration, jvmti.html, jvmti.xsl))
- $(eval $(call SetupJvmtiGeneration, jvmtiEnvStub.cpp, jvmtiEnv.xsl))
-
- JVMTI_BC_SRCDIR := $(HOTSPOT_TOPDIR)/src/share/vm/interpreter
diff -Nru old/openjdk-10-10~46/debian/rules new/openjdk-10-10~46/debian/rules
--- old/openjdk-10-10~46/debian/rules 2018-03-15 14:31:57.000000000 +0100
+++ new/openjdk-10-10~46/debian/rules 2018-03-23 00:50:01.171199985 +0100
@@ -365,11 +365,6 @@
alpha-float-const.diff
endif
-ifneq (,$(filter $(DEB_HOST_ARCH), m68k))
- COMMON_PATCHES += \
- hotspot-disable-jvmtihtml.diff
-endif
-
ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386))
COMMON_PATCHES += \
kfreebsd-support-jdk.diff \
Reply to: