diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2022-02-05 20:40:37 -0800 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2022-02-05 20:41:37 -0800 |
| commit | 0e170396da4d35288e9e05f68c56c295934c82fc (patch) | |
| tree | 73f69de0bb72b579904ef5c5919633bf1305e642 /java/openjdk15/files | |
| parent | java/openjdk13: Update to 13.0.10 GA (diff) | |
java/openjdk15: Update to 15.0.6 GA
Diffstat (limited to 'java/openjdk15/files')
| -rw-r--r-- | java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk index 017b205eb0b3..9e493b64a97f 100644 --- a/java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk +++ b/java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk @@ -1,11 +1,11 @@ --- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2020-07-08 21:33:08 UTC +++ make/modules/java.desktop/lib/Awt2dLibraries.gmk -@@ -631,7 +631,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ +@@ -540,7 +540,7 @@ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_aix := -Wl$(COMMA)-berok, \ LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ - LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ + LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ - LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ - -framework CoreGraphics, \ + LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ + $(WIN_AWT_LIB), \ |