JCK-23 updates (adoptium#5574)

* Remove jck native make of systemInfo for jck-23+ Signed-off-by: Andrew Leonard <anleonar@redhat.com> * Remove jck native make of libjmxlibid for jck-23+ Signed-off-by: Andrew Leonard <anleonar@redhat.com> * Remove jck native make of libgenrandom for jck-23+ Signed-off-by: Andrew Leonard <anleonar@redhat.com> * Remove jck native make of libgenrandom for jck-23+ Signed-off-by: Andrew Leonard <anleonar@redhat.com> --------- Signed-off-by: Andrew Leonard <anleonar@redhat.com>
andrew-m-leonard · Sep 10, 2024 · aff033d · aff033d
1 parent 91595f2
commit aff033d
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/jck/jtrunner/makefile b/jck/jtrunner/makefile
@@ -248,10 +248,14 @@ ifeq ($(OS),win)
 	RANDOMGEN=cd $(FULLOUTDIR) && $(LINK_CMD) $(LFLAGS)"$(FULLOUTDIR)$(D)$@" $(FULLOUTDIR)$(D)com_sun_management_mbeans_loading_RandomGen.obj
 endif
 
-ifeq ($(shell test $(JDK_VERSION) -ge 19; echo $$?),0)
-	OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT)
+ifeq ($(shell test $(JDK_VERSION) -ge 23; echo $$?),0)
+	OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT)
 else
+  ifeq ($(shell test $(JDK_VERSION) -ge 19; echo $$?),0)
+	OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT)
+  else
 	OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT)
+  endif
 endif
 
 CFLAGS := $(CFLAGS) -I"$(SRCDIR)" -I"$(JNI_INCLUDE_PATH)" -I"$(JVMTI_INCLUDE_PATH)"
@@ -315,6 +319,7 @@ $(LIBPREF)jckforeign.$(LIBEXT):SymbolLookup.c Linker.c
 	cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $^ $(OFLAG)$(FULLOUTDIR)$(VAR)
 	$(JCKFOREIGN)
 
+ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0)
 $(LIBPREF)systemInfo.$(LIBEXT):com_sun_management_mbeans_loading_SystemInfoUseNativeLib.c
 	cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(VAR)
 	$(SYSTEMINFOUSENATIVE)
@@ -326,12 +331,14 @@ $(LIBPREF)jmxlibid.$(LIBEXT):com_sun_management_mbeans_loading_GetLibIdFromNativ
 $(LIBPREF)genrandom.$(LIBEXT):com_sun_management_mbeans_loading_RandomGen.c
 	cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(FULLOUTDIR)$(VAR)
 	$(RANDOMGEN)
+endif
 
 createdir:
 	$(CLEANDIR) $(FULLOUTDIR)
 	$(MKDIR) $(FULLOUTDIR)
 
 installjmx:
+ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0)
 ifneq ($(OS),win)
 	$(COPYDIR) $(SRCDIR)$(D)tests$(D)api$(D)javax_management$(D)loading$(D)data$(D)* $(FULLOUTDIR)$(D).
 	cd $(FULLOUTDIR) && $(JAR) uf $(FULLOUTDIR)/archives/MBeanUseNativeLib.jar $(LIBPREF)systemInfo.$(LIBEXT)
@@ -341,6 +348,9 @@ else
 	cd "$(FULLOUTDIR)" && $(JAR) uf "$(FULLOUTDIR)$(D)archives$(D)MBeanUseNativeLib.jar" $(LIBPREF)systemInfo.$(LIBEXT)
 	cd "$(FULLOUTDIR)" && $(JAR) cf "$(FULLOUTDIR)$(D)archives$(D)OnlyLibs.jar" $(LIBPREF)jmxlibid.$(LIBEXT)
 endif
+else
+	echo "JMX not required for jdk-23+"
+endif
 
 .PHONY clean:
 ifneq ($(OS),win)