[11u] RFR: 8245832: JDK build make-static-libs should build all JDK libraries

Thu Jun 18 14:15:03 UTC 2020

Have you done a Mac and Windows build?

My backport is identical to yours except I had to add these additional changes.  I’m not sure if they
are needed on your 11 update release.

--- a/make/lib/Awt2dLibraries.gmk	Thu Nov 07 17:47:22 2019 -0800 <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.1>
+++ b/make/lib/Awt2dLibraries.gmk	Tue Jun 02 17:58:36 2020 +0000 <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.2>
@@ -743,11 +743,11 @@ <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.3>
   ifeq ($(ENABLE_HEADLESS_ONLY), false) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.4>
     $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.5>
   else <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.6>
-    $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.7>
+    $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_headless) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.8>
   endif <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.9>
  <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.10>
   ifeq ($(OPENJDK_TARGET_OS), macosx) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.11>
-    $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.12>
+    $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_lwawt) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.13>
   endif <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.14>
  <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.15>
 endif # OPENJDK_TARGET_OS <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l4.16>
--- a/make/lib/Lib-jdk.accessibility.gmk	Thu Nov 07 17:47:22 2019 -0800 <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.1>
+++ b/make/lib/Lib-jdk.accessibility.gmk	Tue Jun 02 17:58:36 2020 +0000 <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.2>
@@ -55,7 +55,7 @@ <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.3>
         VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.4>
     ) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.5>
  <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.6>
-    $$(BUILD_JAVAACCESSBRIDGE$1): $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.7>
+    $$(BUILD_JAVAACCESSBRIDGE$1): $(call FindStaticLib, java.desktop, jawt, /libjawt) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.8>
  <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.9>
     TARGETS += $$(BUILD_JAVAACCESSBRIDGE$1) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.10>
   endef <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l5.11>
--- a/make/lib/LibCommon.gmk	Thu Nov 07 17:47:22 2019 -0800 <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.1>
+++ b/make/lib/LibCommon.gmk	Tue Jun 02 17:58:36 2020 +0000 <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.2>
@@ -83,9 +83,13 @@ <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.3>
 # Param 1 - module name <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.4>
 # Param 2 - library name <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.5>
 # Param 3 - optional subdir for library <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.6>
-FindStaticLib = \ <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.7>
-    $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \ <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.8>
-        $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX)) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.9>
+ifneq ($(STATIC_LIBS), true) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.10>
+  FindStaticLib = \ <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.11>
+      $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \ <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.12>
+          $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX)) <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.13>
+else <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.14>
+  FindStaticLib = <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.15>
+endif <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.16>
  <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.17>
 # Put the libraries here. <http://closedjdk.us.oracle.com/jdk-updates/jdk11u-cpu/open/rev/bbc5813c0dcd#l6.18>
 INSTALL_LIBRARIES_HERE := $(call FindLibDirForModule, $(MODULE))

> On Jun 18, 2020, at 9:16 AM, Severin Gehwolf <sgehwolf at redhat.com> wrote:
> 
> On Thu, 2020-06-18 at 14:47 +0200, Severin Gehwolf wrote:
>> Hi,
>> 
>> Could I please get a review of this OpenJDK 11 backport? It's one of
>> the 11.0.9-oracle parity ones.
>> 
>> The patch from jdk/jdk didn't apply cleanly due to context changes in
>> make/Main.gmk. Namely, USE_WRAPPER=true, removed with JDK-8245287[1] in
>> head but present in OpenJDK 11 head. Adjusted that bit manually. Other
>> than that, the patch is the same.
>> 
>> Bug: https://bugs.openjdk.java.net/browse/JDK-8245832
> 
> Sorry wrong webrev link previously:
> 
> webrev: http://cr.openjdk.java.net/~sgehwolf/webrevs/JDK-8245832/01/webrev/
> 
>> 
>> Testing: Building static-libs-image target comparing before/after[2].
>> Testing graal build with this. Seems fine.
>> 
>> Thoughts?
>> 
>> Thanks,
>> Severin
>> 
>> [1] https://bugs.openjdk.java.net/browse/JDK-8245287
>> [2] http://cr.openjdk.java.net/~sgehwolf/webrevs/JDK-8245832/01/before_after.txt
> 

