mirror of
https://github.com/termux/termux-packages.git
synced 2024-12-11 23:00:52 +00:00
940a37f5f0
cherry-pick all patches, apply them on upstream JDK, and adapted for newer $UPDATE version fix: type redefinition introduced in 21.0.2
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
From d22c78d7799d85bd1ce40cac3adb2838eca8cf26 Mon Sep 17 00:00:00 2001
|
|
From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
|
|
Date: Sat, 12 Jun 2021 17:03:05 +0700
|
|
Subject: [PATCH 17/37] Libfontmanager: link against libawt to fix link error
|
|
|
|
Partly based on commit from androidports:
|
|
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 62b4477b8..abe1be54a 100644
|
|
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
|
|
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
|
|
@@ -542,13 +542,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
|
|
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
|
|
LDFLAGS_aix := -Wl$(COMMA)-berok, \
|
|
LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
|
|
- LIBS_unix := -lawt -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.45.2
|
|
|