76532e4393
* openvpn: update from 2.4.2 to 2.4.1 * openjdk: update to tag 168 (aarch64 does not build) * openjdk: remove unused patch
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
--- ./common/autoconf/generated-configure.sh 2017-04-01 23:19:09.508381398 +0530
|
|
+++ ../generated-configure.sh 2017-04-02 17:35:37.210373866 +0530
|
|
@@ -51452,7 +51452,7 @@
|
|
|
|
# Set JVM_LIBS (per os)
|
|
if test "x$OPENJDK_TARGET_OS" = xlinux; then
|
|
- JVM_LIBS="$JVM_LIBS -lm -ldl -lpthread"
|
|
+ JVM_LIBS="$JVM_LIBS -lm -lc"
|
|
elif test "x$OPENJDK_TARGET_OS" = xandroid; then
|
|
JVM_LIBS="$JVM_LIBS -lm -llog"
|
|
elif test "x$OPENJDK_TARGET_OS" = xsolaris; then
|
|
@@ -52293,7 +52293,7 @@
|
|
|
|
# Set OPENJDK_BUILD_JVM_LIBS (per os)
|
|
if test "x$OPENJDK_BUILD_OS" = xlinux; then
|
|
- OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -ldl -lpthread"
|
|
+ OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -lc"
|
|
elif test "x$OPENJDK_BUILD_OS" = xandroid; then
|
|
OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -llog"
|
|
elif test "x$OPENJDK_BUILD_OS" = xsolaris; then
|
|
@@ -53412,14 +53412,7 @@
|
|
|
|
|
|
# Check if X11 is needed
|
|
- if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xios || test "x$OPENJDK_TARGET_OS" = xandroid; then
|
|
- # No X11 support on windows or macosx
|
|
NEEDS_LIB_X11=false
|
|
- else
|
|
- # All other instances need X11, even if building headless only, libawt still
|
|
- # needs X11 headers.
|
|
- NEEDS_LIB_X11=true
|
|
- fi
|
|
|
|
# Check if cups is needed
|
|
if test "x$OPENJDK_TARGET_OS" = xwindows; then
|
|
@@ -53435,11 +53428,7 @@
|
|
fi
|
|
|
|
# Check if alsa is needed
|
|
- if test "x$OPENJDK_TARGET_OS" = xlinux; then
|
|
- NEEDS_LIB_ALSA=true
|
|
- else
|
|
NEEDS_LIB_ALSA=false
|
|
- fi
|
|
|
|
# Check if ffi is needed
|
|
if [[ " $JVM_VARIANTS " =~ " zero " ]] || [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then
|