Merge jdk8-b78

Mon, 18 Feb 2013 15:35:05 -0500

author
dholmes
date
Mon, 18 Feb 2013 15:35:05 -0500
changeset 628
fd1a5574cf68
parent 627
28071e4ca1de
parent 622
b0642df54d63
child 629
91d35211e744
child 631
ab82853d3365
child 644
b70196e01c53

Merge

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Sun Feb 17 16:44:28 2013 -0500
     1.2 +++ b/common/autoconf/generated-configure.sh	Mon Feb 18 15:35:05 2013 -0500
     1.3 @@ -649,6 +649,7 @@
     1.4  CXXFLAGS_JDKLIB
     1.5  CFLAGS_JDKEXE
     1.6  CFLAGS_JDKLIB
     1.7 +MACOSX_REQUIRED_VERSION
     1.8  PACKAGE_PATH
     1.9  LEGACY_EXTRA_LDFLAGS
    1.10  LEGACY_EXTRA_CXXFLAGS
    1.11 @@ -3731,7 +3732,7 @@
    1.12  #CUSTOM_AUTOCONF_INCLUDE
    1.13  
    1.14  # Do not change or remove the following line, it is needed for consistency checks:
    1.15 -DATE_WHEN_GENERATED=1361137039
    1.16 +DATE_WHEN_GENERATED=1361218904
    1.17  
    1.18  ###############################################################################
    1.19  #
    1.20 @@ -28241,6 +28242,10 @@
    1.21  fi
    1.22  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
    1.23      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
    1.24 +    # Adding these macros will make it an error to link to mac APIs newer than OS version 10.7
    1.25 +    MACOSX_REQUIRED_VERSION=1070
    1.26 +
    1.27 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)"
    1.28  fi
    1.29  if test "x$OPENJDK_TARGET_OS" = xbsd; then
    1.30      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
     2.1 --- a/common/autoconf/spec.gmk.in	Sun Feb 17 16:44:28 2013 -0500
     2.2 +++ b/common/autoconf/spec.gmk.in	Mon Feb 18 15:35:05 2013 -0500
     2.3 @@ -282,6 +282,9 @@
     2.4  X_LIBS:=@X_LIBS@
     2.5  OPENWIN_HOME:=@OPENWIN_HOME@
     2.6  
     2.7 +# The lowest required version of macosx to enforce compatiblity for
     2.8 +MACOSX_REQUIRED_VERSION=@MACOSX_REQUIRED_VERSION@
     2.9 +
    2.10  # There are two types: CC or CL
    2.11  # CC is gcc and others behaving reasonably similar.
    2.12  # CL is cl.exe only.
     3.1 --- a/common/autoconf/toolchain.m4	Sun Feb 17 16:44:28 2013 -0500
     3.2 +++ b/common/autoconf/toolchain.m4	Mon Feb 18 15:35:05 2013 -0500
     3.3 @@ -876,6 +876,10 @@
     3.4  fi
     3.5  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     3.6      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
     3.7 +    # Adding these macros will make it an error to link to mac APIs newer than OS version 10.7
     3.8 +    MACOSX_REQUIRED_VERSION=1070
     3.9 +    AC_SUBST(MACOSX_REQUIRED_VERSION)
    3.10 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)" 
    3.11  fi
    3.12  if test "x$OPENJDK_TARGET_OS" = xbsd; then
    3.13      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"

mercurial