0
0
mirror of https://github.com/termux/termux-packages.git synced 2024-12-12 14:13:36 +00:00
termux-packages/packages/openjdk-17/0006-Link-against-system-libiconv.patch

40 lines
1.5 KiB
Diff

From 0e8ecf28408a9efae19ae58b63821c8fffb8792f Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@termux.dev>
Date: Fri, 3 Feb 2023 11:09:10 +0100
Subject: [PATCH] Link against system libiconv
---
make/modules/java.instrument/Lib.gmk | 2 +-
make/modules/jdk.jdwp.agent/Lib.gmk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/make/modules/java.instrument/Lib.gmk b/make/modules/java.instrument/Lib.gmk
index 3996ad213864..727f312da92a 100644
--- a/make/modules/java.instrument/Lib.gmk
+++ b/make/modules/java.instrument/Lib.gmk
@@ -49,7 +49,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
LDFLAGS_aix := -L$(SUPPORT_OUTPUTDIR)/native/java.base, \
LIBS := $(JDKLIB_LIBS), \
LIBS_unix := -ljava -ljvm $(LIBZ_LIBS), \
- LIBS_linux := -ljli $(LIBDL), \
+ LIBS_linux := -ljli -liconv $(LIBDL), \
LIBS_aix := -liconv -ljli_static $(LIBDL), \
LIBS_macosx := -ljli -liconv -framework Cocoa -framework Security \
-framework ApplicationServices, \
diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk
index aef358c14bd5..fbc1750bc58a 100644
--- a/make/modules/jdk.jdwp.agent/Lib.gmk
+++ b/make/modules/jdk.jdwp.agent/Lib.gmk
@@ -61,7 +61,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := $(JDKLIB_LIBS), \
- LIBS_linux := $(LIBDL), \
+ LIBS_linux := -liconv $(LIBDL), \
LIBS_macosx := -liconv, \
LIBS_aix := -liconv, \
))
--
2.44.0