components/runtime/openjdk-11/patches/make_GenerateLinkOptData.gmk.patch

   1 $NetBSD$
   2
   3 Ensure java libraries can be found during build.
   4
   5 --- a/make/GenerateLinkOptData.gmk.orig 2019-01-08 09:40:28.000000000 +0000
   6 +++ b/make/GenerateLinkOptData.gmk
   7 @@ -61,6 +61,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/
   8         $(call MakeDir, $(LINK_OPT_DIR))
   9         $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
  10         $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
  11 +       LD_LIBRARY_PATH=$(INTERIM_IMAGE_DIR)/lib:$(INTERIM_IMAGE_DIR)/lib/jli \
  12         $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
  13             -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
  14             -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \