openjdk-17: extract libfontmanager patch from repository
This commit is contained in:
parent
08b1ffd458
commit
0561eb8cbd
@ -0,0 +1,33 @@
|
||||
From 1b8989d1093511649da820fd108794dd424279d9 Mon Sep 17 00:00:00 2001
|
||||
From: AndroidPorts <androidports@users.noreply.github.com>
|
||||
Date: Sun, 22 Aug 2021 13:04:28 +0300
|
||||
Subject: [PATCH] Libfontmanager: Fix for library dependency.
|
||||
|
||||
This commit base is from: https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9c827b11
|
||||
---
|
||||
make/modules/java.desktop/lib/Awt2dLibraries.gmk | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
|
||||
index 0bd1b5063..e2c456c45 100644
|
||||
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
|
||||
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
|
||||
@@ -527,13 +527,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
|
||||
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
|
||||
LDFLAGS_aix := -Wl$(COMMA)-berok, \
|
||||
LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
|
||||
- LIBS_unix := -lawt -lawt_headless -ljava -ljvm $(LIBM) $(LIBCXX), \
|
||||
+ LIBS_unix := -lawt -lawt_xawt -ljava -ljvm -lc $(LIBM) $(LIBCXX), \
|
||||
LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \
|
||||
LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
|
||||
$(WIN_AWT_LIB), \
|
||||
))
|
||||
|
||||
-$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
|
||||
+$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) $(BUILD_LIBAWT_XAWT)
|
||||
|
||||
ifeq ($(call isTargetOs, macosx), true)
|
||||
$(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt)
|
||||
--
|
||||
2.30.2
|
||||
|
Loading…
Reference in New Issue
Block a user