TheCloud/angelauramc-openjdk-build
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/angelauramc-openjdk-build.git synced 2025-09-15 15:14:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update libpthread.patch

Browse Source
This commit is contained in:
Tran Khanh Duy 2020-09-16 16:37:29 +07:00 committed by GitHub
parent f270e59fcc
commit f1c21ddbd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
termux-openjdk-aarch64-patches/jdk/libpthread.patch
View File

@ -1,23 +1,5 @@
--- ./make/lib/Awt2dLibraries.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ./make/lib/Awt2dLibraries.gmk 2017-04-02 18:36:12.582240305 +0530
@@ -145,7 +145,7 @@
LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility
endif
-ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
+ifneq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), )
LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
endif
@@ -212,7 +212,7 @@
LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
endif
-ifeq ($(OPENJDK_TARGET_OS), android)
+ifeq ($(OPENJDK_TARGET_OS), linux)
LIBAWT_EXFILES += \
java2d/loops/TransformHelper.c \
java2d/loops/ScaledBlit.c \
@@ -347,10 +347,10 @@
endif
endif
@ -31,15 +13,6 @@
endif
ifeq ($(TOOLCHAIN_TYPE), gcc)
@@ -669,7 +669,7 @@
X11TextRenderer.c \
fontpath.c \
lcdglyph.c
-else ifeq ($(OPENJDK_TARGET_OS), android)
+else ifeq ($(OPENJDK_TARGET_OS), linux)
LIBFONTMANAGER_EXCLUDE_FILES += X11TextRenderer.c
else
LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
@@ -939,7 +939,7 @@
LIBSPLASHSCREEN_LDFLAGS := -delayload:user32.dll
LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
@ -49,34 +22,3 @@
endif
$(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \
--- ./jdk/make/lib/Lib-java.desktop.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../Lib-java.desktop.gmk 2017-04-02 19:01:58.000696690 +0530
@@ -31,7 +31,7 @@
include LibosxLibraries.gmk
include PlatformLibraries.gmk
-ifeq (,$(filter $(OPENJDK_TARGET_OS), android ios))
+ifeq (,$(filter $(OPENJDK_TARGET_OS), android ios linux))
include Awt2dLibraries.gmk
endif
include SoundLibraries.gmk
--- ./jdk/make/lib/SoundLibraries.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../SoundLibraries.gmk 2017-04-02 19:14:25.382032835 +0530
@@ -69,16 +69,11 @@
LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
endif # OPENJDK_TARGET_OS windows
-ifeq ($(OPENJDK_TARGET_OS), linux)
- EXTRA_SOUND_JNI_LIBS += jsoundalsa
- LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX
-endif # OPENJDK_TARGET_OS linux
-
ifeq ($(OPENJDK_TARGET_OS), aix)
LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX
endif # OPENJDK_TARGET_OS aix
-ifeq ($(OPENJDK_TARGET_OS), android)
+ifeq ($(OPENJDK_TARGET_OS), linux)
LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX
endif