X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/1f3323ce42782fcd1c9ba2cfa725da4ce5998da9..991e770d787f25be92a1051e5c1bc36fe037ecc3:/disabled-packages/openjdk-9-jre-headless/libpthread.patch

diff --git a/disabled-packages/openjdk-9-jre-headless/libpthread.patch b/disabled-packages/openjdk-9-jre-headless/libpthread.patch
index c9ed3fb8..f3ea428a 100644
--- a/disabled-packages/openjdk-9-jre-headless/libpthread.patch
+++ b/disabled-packages/openjdk-9-jre-headless/libpthread.patch
@@ -1,69 +1,3 @@
---- ./jdk/make/lib/NioLibraries.gmk	2017-03-30 20:45:48.000000000 +0530
-+++ ../NioLibraries.gmk	2017-04-02 18:02:51.838192783 +0530
-@@ -80,7 +80,7 @@
-     LDFLAGS := $(LDFLAGS_JDKLIB) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-     LIBS_unix := -ljava -lnet, \
--    LIBS_linux := -lpthread $(LIBDL), \
-+    LIBS_linux := -lc $(LIBDL), \
-     LIBS_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \
-         -lsendfile -lc, \
-     LIBS_aix := $(LIBDL), \
---- ./jdk/make/lib/Lib-jdk.sctp.gmk	2017-03-30 20:45:48.000000000 +0530
-+++ ../Lib-jdk.sctp.gmk	2017-04-02 18:04:18.014072129 +0530
-@@ -50,7 +50,7 @@
-             $(call SET_SHARED_LIBRARY_ORIGIN), \
-         LDFLAGS := $(LDFLAGS_JDKLIB), \
-         LIBS_unix := -lnio -lnet -ljava -ljvm, \
--        LIBS_linux := -lpthread $(LIBDL), \
-+        LIBS_linux := -lc $(LIBDL), \
-         LIBS_solaris := -lsocket -lc, \
-         OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \
-     ))
---- ./jdk/make/lib/Lib-jdk.jdwp.agent.gmk	2017-03-30 20:45:48.000000000 +0530
-+++ ../Lib-jdk.jdwp.agent.gmk	2017-04-02 18:05:56.109871847 +0530
-@@ -47,7 +47,7 @@
-     LDFLAGS := $(LDFLAGS_JDKLIB) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-     LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
--    LIBS_linux := -lpthread, \
-+    LIBS_linux := -lc, \
-     LIBS_solaris := -lnsl -lsocket -lc, \
-     LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \
-     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
---- ./jdk/make/lib/CoreLibraries.gmk	2017-03-30 20:45:48.000000000 +0530
-+++ ../CoreLibraries.gmk	2017-04-02 18:06:45.519445303 +0530
-@@ -407,7 +407,7 @@
-         -export:JLI_AddArgsFromEnvVar \
-         -export:JLI_GetAppArgIndex, \
-     LIBS_unix := $(LIBZ), \
--    LIBS_linux := $(LIBDL) -lc -lpthread, \
-+    LIBS_linux := $(LIBDL) -lc, \
-     LIBS_android := $(LIBDL) -lc -llog, \
-     LIBS_solaris := $(LIBDL) -lc, \
-     LIBS_aix := $(LIBDL),\
---- ./jdk/make/lib/NetworkingLibraries.gmk	2017-03-30 20:45:48.000000000 +0530
-+++ ../NetworkingLibraries.gmk	2017-04-02 18:08:05.098770606 +0530
-@@ -46,7 +46,7 @@
-     LDFLAGS_windows := -delayload:secur32.dll -delayload:iphlpapi.dll, \
-     LIBS_unix := -ljvm -ljava, \
-     LIBS_android := -llog, \
--    LIBS_linux := $(LIBDL) -lpthread, \
-+    LIBS_linux := -lc, \
-     LIBS_solaris := -lnsl -lsocket $(LIBDL) -lc, \
-     LIBS_aix := $(LIBDL),\
-     LIBS_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib winhttp.lib \
---- ./jdk/make/launcher/LauncherCommon.gmk	2017-03-30 20:45:48.000000000 +0530
-+++ ../LauncherCommon.gmk	2017-04-02 18:09:02.258294282 +0530
-@@ -201,7 +201,7 @@
-       LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \
-       LIBS_unix := $$($1_LIBS_unix), \
-       LIBS_android := -llog -ljli $(LIBDL) -lc, \
--      LIBS_linux := -lpthread -ljli $(LIBDL) -lc, \
-+      LIBS_linux := -ljli $(LIBDL) -lc, \
-       LIBS_solaris := -ljli -lthread $(LIBDL) -lc, \
-       LIBS_windows := $$($1_WINDOWS_JLI_LIB) \
-           $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib advapi32.lib \
 --- ./jdk/make/lib/Awt2dLibraries.gmk	2017-03-30 20:45:48.000000000 +0530
 +++ ../Awt2dLibraries.gmk	2017-04-02 18:36:12.582240305 +0530
 @@ -145,7 +145,7 @@