Commit | Line | Data |
---|---|---|
1f3323ce VB |
1 | --- ./common/autoconf/generated-configure.sh 2017-04-01 23:19:09.508381398 +0530 |
2 | +++ ../generated-configure.sh 2017-04-02 17:35:37.210373866 +0530 | |
3 | @@ -51452,7 +51452,7 @@ | |
4 | ||
5 | # Set JVM_LIBS (per os) | |
6 | if test "x$OPENJDK_TARGET_OS" = xlinux; then | |
7 | - JVM_LIBS="$JVM_LIBS -lm -ldl -lpthread" | |
8 | + JVM_LIBS="$JVM_LIBS -lm -lc" | |
9 | elif test "x$OPENJDK_TARGET_OS" = xandroid; then | |
10 | JVM_LIBS="$JVM_LIBS -lm -llog" | |
11 | elif test "x$OPENJDK_TARGET_OS" = xsolaris; then | |
12 | @@ -52293,7 +52293,7 @@ | |
13 | ||
14 | # Set OPENJDK_BUILD_JVM_LIBS (per os) | |
15 | if test "x$OPENJDK_BUILD_OS" = xlinux; then | |
16 | - OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -ldl -lpthread" | |
17 | + OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -lc" | |
18 | elif test "x$OPENJDK_BUILD_OS" = xandroid; then | |
19 | OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -llog" | |
20 | elif test "x$OPENJDK_BUILD_OS" = xsolaris; then | |
21 | @@ -53412,14 +53412,7 @@ | |
22 | ||
23 | ||
24 | # Check if X11 is needed | |
25 | - 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 | |
26 | - # No X11 support on windows or macosx | |
27 | NEEDS_LIB_X11=false | |
28 | - else | |
29 | - # All other instances need X11, even if building headless only, libawt still | |
30 | - # needs X11 headers. | |
31 | - NEEDS_LIB_X11=true | |
32 | - fi | |
33 | ||
34 | # Check if cups is needed | |
35 | if test "x$OPENJDK_TARGET_OS" = xwindows; then | |
36 | @@ -53435,11 +53428,7 @@ | |
37 | fi | |
38 | ||
39 | # Check if alsa is needed | |
40 | - if test "x$OPENJDK_TARGET_OS" = xlinux; then | |
41 | - NEEDS_LIB_ALSA=true | |
42 | - else | |
43 | NEEDS_LIB_ALSA=false | |
44 | - fi | |
45 | ||
46 | # Check if ffi is needed | |
47 | if [[ " $JVM_VARIANTS " =~ " zero " ]] || [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then |