From 281c83316619ee133aca760c690f48a18c67371e Mon Sep 17 00:00:00 2001
From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
Date: Mon, 11 Nov 2019 11:28:23 +0100
Subject: [PATCH] jdk: factor out verify.lib.so

This makes verify.lib.so dlopen-able.

fixes #191
---
 lib/mk/java.inc            |  3 ---
 lib/mk/jvm.inc             |  2 +-
 lib/mk/verify.mk           | 17 +++++++++++++++++
 recipes/src/jdk/content.mk |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 lib/mk/verify.mk

diff --git a/lib/mk/java.inc b/lib/mk/java.inc
index f9b2774..6dc2bd2 100644
--- a/lib/mk/java.inc
+++ b/lib/mk/java.inc
@@ -3,7 +3,6 @@ SHARED_LIB    = yes
 JDK_BASE      = $(call select_from_ports,jdk)/src/app/jdk/jdk/src/java.base
 JDK_GENERATED = $(call select_from_ports,jdk_generated)/src/app/jdk
 JAVA_BASE     = $(JDK_BASE)/share/native/libjava
-VERIFY_BASE   = $(JDK_BASE)/share/native/libverify
 
 SRC_C  = $(notdir $(wildcard $(JAVA_BASE)/*.c))
 SRC_C += unix/native/libjava/canonicalize_md.c \
@@ -19,7 +18,6 @@ SRC_C += unix/native/libjava/canonicalize_md.c \
          unix/native/libjava/TimeZone_md.c \
          unix/native/libjava/UnixFileSystem_md.c
 
-SRC_C += check_format.c check_code.c
 SRC_C += math_genode.c
 
 
@@ -38,7 +36,6 @@ INC_DIR += $(REP_DIR)/src/app/jdk/lib/include \
            $(JDK_BASE)/unix/native/libjava
 
 vpath %.c $(JAVA_BASE)
-vpath %.c $(VERIFY_BASE)
 vpath %.c $(JDK_BASE)
 vpath %.c $(REP_DIR)/src/app/jdk/lib/java
 
diff --git a/lib/mk/jvm.inc b/lib/mk/jvm.inc
index fb3d50d..d3110e2 100644
--- a/lib/mk/jvm.inc
+++ b/lib/mk/jvm.inc
@@ -1,4 +1,4 @@
-LIBS         = stdcxx jzip jimage nio jnet libc libc_pipe
+LIBS         = stdcxx jzip jimage nio jnet libc libc_pipe verify
 SHARED_LIB   = yes
 HOTSPOT_BASE = $(call select_from_ports,jdk)/src/app/jdk/hotspot/src
 
diff --git a/lib/mk/verify.mk b/lib/mk/verify.mk
new file mode 100644
index 0000000..d64e128
--- /dev/null
+++ b/lib/mk/verify.mk
@@ -0,0 +1,17 @@
+LIBS        = libc
+SHARED_LIB  = yes
+JDK_BASE    = $(call select_from_ports,jdk)/src/app/jdk/jdk/src/java.base
+VERIFY_BASE = $(JDK_BASE)/share/native/libverify
+
+SRC_C += check_format.c check_code.c
+
+include $(REP_DIR)/lib/mk/jdk_version.inc
+
+INC_DIR += $(JDK_BASE)/share/native/include \
+           $(JDK_BASE)/share/native/libjava \
+           $(JDK_BASE)/unix/native/include \
+           $(JDK_BASE)/unix/native/libjava
+
+vpath %.c $(VERIFY_BASE)
+
+# vi: set ft=make :
diff --git a/recipes/src/jdk/content.mk b/recipes/src/jdk/content.mk
index b5ec561..3a13dfa 100644
--- a/recipes/src/jdk/content.mk
+++ b/recipes/src/jdk/content.mk
@@ -1,4 +1,4 @@
-LIB_MK_FILES := java.inc jdk_version.inc jimage.mk jli.mk \
+LIB_MK_FILES := java.inc jdk_version.inc jimage.mk jli.mk verify.mk \
                 jnet.mk jvm.inc jzip.mk management.mk nio.mk \
                $(foreach SPEC,x86_64 arm, \
                 spec/$(SPEC)/java.mk spec/$(SPEC)/jvm.mk) \