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

[Severin Gehwolf]

Hi Bob,

Thanks for the review!

On Thu, 2020-06-18 at 10:15 -0400, Bob Vandette wrote:
> Have you done a Mac and Windows build?

I have not. But I will try to find somebody to do it for me...

> 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.

Thanks for that!

Cheers,
Severin

> --- a/make/lib/Awt2dLibraries.gmk	Thu Nov 07 17:47:22 2019 -0800
> +++ b/make/lib/Awt2dLibraries.gmk	Tue Jun 02 17:58:36 2020 +0000
> @@ -743,11 +743,11 @@
>    ifeq ($(ENABLE_HEADLESS_ONLY), false)
>      $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
>    else
> -    $(BUILD_LIBJAWT):
> $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRA
> RY_SUFFIX)
> +    $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_headless)
>    endif
>  
>    ifeq ($(OPENJDK_TARGET_OS), macosx)
> -    $(BUILD_LIBJAWT):
> $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_
> SUFFIX)
> +    $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_lwawt)
>    endif
>  
>  endif # OPENJDK_TARGET_OS
> --- a/make/lib/Lib-jdk.accessibility.gmk	Thu Nov 07 17:47:22
> 2019 -0800
> +++ b/make/lib/Lib-jdk.accessibility.gmk	Tue Jun 02 17:58:36
> 2020 +0000
> @@ -55,7 +55,7 @@
>          VERSIONINFO_RESOURCE :=
> $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
>      )
>  
> -    $$(BUILD_JAVAACCESSBRIDGE$1):
> $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib
> +    $$(BUILD_JAVAACCESSBRIDGE$1): $(call FindStaticLib,
> java.desktop, jawt, /libjawt)
>  
>      TARGETS += $$(BUILD_JAVAACCESSBRIDGE$1)
>    endef
> --- a/make/lib/LibCommon.gmk	Thu Nov 07 17:47:22 2019 -0800
> +++ b/make/lib/LibCommon.gmk	Tue Jun 02 17:58:36 2020 +0000
> @@ -83,9 +83,13 @@
>  # Param 1 - module name
>  # Param 2 - library name
>  # Param 3 - optional subdir for library
> -FindStaticLib = \
> -    $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \
> -        $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip
> $2)$(STATIC_LIBRARY_SUFFIX))
> +ifneq ($(STATIC_LIBS), true)
> +  FindStaticLib = \
> +      $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \
> +          $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip
> $2)$(STATIC_LIBRARY_SUFFIX))
> +else
> +  FindStaticLib =
> +endif
>  
>  # Put the libraries here.
>  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
> 
>