chiark - git - mdw - termux-packages/blob - disabled-packages/openjdk-9-headless/libpthread.diff

   1 --- ./dev-jdk-9+@TAG_VER@/common/autoconf/flags.m4      2016-12-21 03:14:04.000000000 +0530
   2 +++ ../../flags.m4      2017-01-22 13:35:01.668555165 +0530
   3 @@ -1297,7 +1297,7 @@
   4
   5    # Set $2JVM_LIBS (per os)
   6    if test "x$OPENJDK_$1_OS" = xlinux; then
   7 -    $2JVM_LIBS="[$]$2JVM_LIBS -lm -ldl -lpthread"
   8 +    $2JVM_LIBS="[$]$2JVM_LIBS -lm -ldl"
   9    elif test "x$OPENJDK_$1_OS" = xsolaris; then
  10      # FIXME: This hard-coded path is not really proper.
  11      if test "x$OPENJDK_$1_CPU" = xx86_64; then
  12 --- ./jdk/make/lib/Awt2dLibraries.gmk   2016-12-21 03:43:34.000000000 +0530
  13 +++ ./jdk-jdk-9+@TAG_VER@/make/lib/Awt2dLibraries.gmk   2017-01-22 13:36:55.817520779 +0530
  14 @@ -330,10 +330,6 @@
  15
  16      LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
  17
  18 -    ifeq ($(OPENJDK_TARGET_OS), linux)
  19 -      LIBAWT_XAWT_LIBS += -lpthread
  20 -    endif
  21 -
  22      ifeq ($(TOOLCHAIN_TYPE), gcc)
  23        # Turn off all warnings for the following files since they contain warnings
  24        # that cannot be turned of individually.
  25 @@ -906,7 +902,7 @@
  26      LIBSPLASHSCREEN_LDFLAGS := -delayload:user32.dll
  27      LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
  28    else
  29 -    LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
  30 +    LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -ldl
  31    endif
  32
  33    $(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \
  34 --- ./jdk/make/lib/NioLibraries.gmk     2016-12-21 03:43:34.000000000 +0530
  35 +++ ./jdk-jdk-9+@TAG_VER@/make/lib/NioLibraries.gmk     2017-01-22 13:38:05.550161653 +0530
  36 @@ -69,7 +69,7 @@
  37      LDFLAGS := $(LDFLAGS_JDKLIB) \
  38          $(call SET_SHARED_LIBRARY_ORIGIN), \
  39      LIBS_unix := -ljava -lnet, \
  40 -    LIBS_linux := -lpthread $(LIBDL), \
  41 +    LIBS_linux := $(LIBDL), \
  42      LIBS_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \
  43          -lsendfile -lc, \
  44      LIBS_aix := $(LIBDL), \
  45 --- ./jdk/make/lib/Lib-jdk.sctp.gmk     2016-12-21 03:43:34.000000000 +0530
  46 +++ ./jdk-jdk-9+@TAG_VER@/make/lib/Lib-jdk.sctp.gmk     2017-01-22 13:38:39.083147832 +0530
  47 @@ -50,7 +50,7 @@
  48          LDFLAGS := $(LDFLAGS_JDKLIB) \
  49              $(call SET_SHARED_LIBRARY_ORIGIN), \
  50          LIBS_unix := -lnio -lnet -ljava -ljvm, \
  51 -        LIBS_linux := -lpthread $(LIBDL), \
  52 +        LIBS_linux := $(LIBDL), \
  53          LIBS_solaris := -lsocket -lc, \
  54          OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \
  55      ))
  56 --- ./jdk/make/lib/CoreLibraries.gmk    2016-12-21 03:43:34.000000000 +0530
  57 +++ ./jdk-jdk-9+@TAG_VER@/make/lib/CoreLibraries.gmk    2017-01-22 13:39:17.676071246 +0530
  58 @@ -389,7 +389,7 @@
  59          -export:JLI_PreprocessArg \
  60          -export:JLI_GetAppArgIndex, \
  61      LIBS_unix := $(LIBZ), \
  62 -    LIBS_linux := $(LIBDL) -lc -lpthread, \
  63 +    LIBS_linux := $(LIBDL) -lc, \
  64      LIBS_solaris := $(LIBDL) -lc, \
  65      LIBS_aix := $(LIBDL),\
  66      LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
  67 --- ./jdk/make/lib/Lib-jdk.jdwp.agent.gmk       2016-12-21 03:43:34.000000000 +0530
  68 +++ ./jdk-jdk-9+@TAG_VER@/make/lib/Lib-jdk.jdwp.agent.gmk       2017-01-22 13:40:42.121805959 +0530
  69 @@ -47,7 +47,7 @@
  70      LDFLAGS := $(LDFLAGS_JDKLIB) \
  71          $(call SET_SHARED_LIBRARY_ORIGIN), \
  72      LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
  73 -    LIBS_linux := -lpthread, \
  74 +    LIBS_linux := -lc, \
  75      LIBS_solaris := -lnsl -lsocket -lc, \
  76      LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \
  77      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
  78 --- ./jdk/make/lib/NetworkingLibraries.gmk      2016-12-21 03:43:34.000000000 +0530
  79 +++ ./jdk-jdk-9+@TAG_VER@/make/lib/NetworkingLibraries.gmk      2017-01-22 13:41:39.251151227 +0530
  80 @@ -41,7 +41,7 @@
  81          $(call SET_SHARED_LIBRARY_ORIGIN), \
  82      LDFLAGS_windows := -delayload:secur32.dll -delayload:iphlpapi.dll, \
  83      LIBS_unix := -ljvm -ljava, \
  84 -    LIBS_linux := $(LIBDL) -lpthread, \
  85 +    LIBS_linux := $(LIBDL), \
  86      LIBS_solaris := -lnsl -lsocket $(LIBDL) -lc, \
  87      LIBS_aix := $(LIBDL),\
  88      LIBS_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
  89 --- ./jdk/make/launcher/LauncherCommon.gmk      2016-12-21 03:43:34.000000000 +0530
  90 +++ ./jdk-jdk-9+@TAG_VER@/make/launcher/LauncherCommon.gmk      2017-01-22 13:42:01.530891130 +0530
  91 @@ -196,7 +196,7 @@
  92        MAPFILE := $$($1_MAPFILE), \
  93        LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \
  94        LIBS_unix := $$($1_LIBS_unix), \
  95 -      LIBS_linux := -lpthread -ljli $(LIBDL) -lc, \
  96 +      LIBS_linux := -ljli $(LIBDL) -lc, \
  97        LIBS_solaris := -ljli -lthread $(LIBDL) -lc, \
  98        LIBS_windows := $$($1_WINDOWS_JLI_LIB) \
  99            $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib advapi32.lib \
 100 --- ./dev-jdk-9+@TAG_VER@//common/autoconf/generated-configure.sh       2016-12-21 03:14:04.000000000 +0530
 101 +++ ../../generated-configure.sh        2017-01-22 14:01:05.792364527 +0530
 102 @@ -50593,7 +50593,7 @@
 103
 104    # Set JVM_LIBS (per os)
 105    if test "x$OPENJDK_TARGET_OS" = xlinux; then
 106 -    JVM_LIBS="$JVM_LIBS -lm -ldl -lpthread"
 107 +    JVM_LIBS="$JVM_LIBS -lm -ldl"
 108    elif test "x$OPENJDK_TARGET_OS" = xsolaris; then
 109      # FIXME: This hard-coded path is not really proper.
 110      if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 111 @@ -51416,7 +51416,7 @@
 112
 113    # Set OPENJDK_BUILD_JVM_LIBS (per os)
 114    if test "x$OPENJDK_BUILD_OS" = xlinux; then
 115 -    OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -ldl -lpthread"
 116 +    OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -ldl"
 117    elif test "x$OPENJDK_BUILD_OS" = xsolaris; then
 118      # FIXME: This hard-coded path is not really proper.
 119      if test "x$OPENJDK_BUILD_CPU" = xx86_64; then