8010785: JDK 8 build on Linux fails with new build mechanism

Tue, 11 Jun 2013 13:25:21 +0200

author
erikj
date
Tue, 11 Jun 2013 13:25:21 +0200
changeset 734
3cbcc2b6ba41
parent 733
198d25db45da
child 735
50d2bde060f2

8010785: JDK 8 build on Linux fails with new build mechanism
Reviewed-by: dholmes, tbell

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/jdk-options.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Tue Jun 11 13:08:02 2013 +0200
     1.2 +++ b/common/autoconf/generated-configure.sh	Tue Jun 11 13:25:21 2013 +0200
     1.3 @@ -3782,7 +3782,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1370948811
     1.8 +DATE_WHEN_GENERATED=1370949244
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -10782,11 +10782,7 @@
    1.13  if test "x$with_cacerts_file" != x; then
    1.14      CACERTS_FILE=$with_cacerts_file
    1.15  else
    1.16 -    if test "x$OPENJDK" = "xtrue"; then
    1.17 -        CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
    1.18 -    else
    1.19 -        CACERTS_FILE=${SRC_ROOT}/jdk/src/closed/share/lib/security/cacerts.internal
    1.20 -    fi
    1.21 +    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
    1.22  fi
    1.23  
    1.24  
     2.1 --- a/common/autoconf/jdk-options.m4	Tue Jun 11 13:08:02 2013 +0200
     2.2 +++ b/common/autoconf/jdk-options.m4	Tue Jun 11 13:25:21 2013 +0200
     2.3 @@ -351,11 +351,7 @@
     2.4  if test "x$with_cacerts_file" != x; then
     2.5      CACERTS_FILE=$with_cacerts_file
     2.6  else
     2.7 -    if test "x$OPENJDK" = "xtrue"; then
     2.8 -        CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
     2.9 -    else
    2.10 -        CACERTS_FILE=${SRC_ROOT}/jdk/src/closed/share/lib/security/cacerts.internal
    2.11 -    fi
    2.12 +    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
    2.13  fi
    2.14  AC_SUBST(CACERTS_FILE)
    2.15  

mercurial