From c1b344b0113225b3e2cba70ffc9f571f14c734f1 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sat, 9 Oct 2021 17:28:41 -0700 Subject: java/openjdk17: Fix libfontmanager linkage * Backport the fix from jdk17u so that --with-harfbuzz=system adds -lharfbuzz when linking libfontmanager.so Reported by: barulheira@gmail.com --- .../files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk') diff --git a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk index 65f66318255d..11eaa6868f3e 100644 --- a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk +++ b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk @@ -1,5 +1,14 @@ --- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2021-09-18 15:30:22.109237000 -0700 +++ make/modules/java.desktop/lib/Awt2dLibraries.gmk 2021-09-18 15:31:02.024314000 -0700 +@@ -435,7 +435,7 @@ + + ifeq ($(USE_EXTERNAL_HARFBUZZ), true) + LIBFONTMANAGER_EXTRA_SRC = +- BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS) ++ BUILD_LIBFONTMANAGER_FONTLIB += $(HARFBUZZ_LIBS) + else + LIBFONTMANAGER_EXTRA_SRC = libharfbuzz + @@ -530,7 +530,7 @@ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_aix := -Wl$(COMMA)-berok, \ -- cgit v1.2.3