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
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From e87e1978d2463dfdd4b123e62dafabe94fad9767 Mon Sep 17 00:00:00 2001
|
|
From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
|
|
Date: Thu, 10 Jun 2021 19:23:03 +0700
|
|
Subject: [PATCH 12/37] Add CXXFLAGS_JDKLIB to CXXFLAGS
|
|
|
|
For modules jdk.jdwp.agent and java.instrument.
|
|
---
|
|
make/modules/java.instrument/Lib.gmk | 1 +
|
|
make/modules/jdk.jdwp.agent/Lib.gmk | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/make/modules/java.instrument/Lib.gmk b/make/modules/java.instrument/Lib.gmk
|
|
index 417e0d6a0..73a937854 100644
|
|
--- a/make/modules/java.instrument/Lib.gmk
|
|
+++ b/make/modules/java.instrument/Lib.gmk
|
|
@@ -39,6 +39,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
|
|
CFLAGS := $(CFLAGS_JDKLIB) $(LIBINSTRUMENT_CFLAGS), \
|
|
CFLAGS_debug := -DJPLIS_LOGGING, \
|
|
CFLAGS_release := -DNO_JPLIS_LOGGING, \
|
|
+ CXXFLAGS := $(CXXFLAGS_JDKLIB), \
|
|
EXTRA_HEADER_DIRS := java.base:libjli, \
|
|
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
|
$(call SET_SHARED_LIBRARY_ORIGIN) \
|
|
diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk
|
|
index 9631bf239..ae889b6f5 100644
|
|
--- a/make/modules/jdk.jdwp.agent/Lib.gmk
|
|
+++ b/make/modules/jdk.jdwp.agent/Lib.gmk
|
|
@@ -58,6 +58,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
|
|
DISABLED_WARNINGS_clang_EventRequestImpl.c := self-assign, \
|
|
DISABLED_WARNINGS_clang_inStream.c := sometimes-uninitialized, \
|
|
DISABLED_WARNINGS_clang_log_messages.c := format-nonliteral, \
|
|
+ CXXFLAGS := $(CXXFLAGS_JDKLIB), \
|
|
EXTRA_HEADER_DIRS := \
|
|
include \
|
|
libjdwp/export, \
|
|
--
|
|
2.45.2
|
|
|