Fri, 15 Feb 2013 10:40:46 +0100
8005879: Add -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 to builds on Mac
Reviewed-by: ohair
1.1 --- a/common/autoconf/generated-configure.sh Thu Feb 07 12:32:32 2013 -0800 1.2 +++ b/common/autoconf/generated-configure.sh Fri Feb 15 10:40:46 2013 +0100 1.3 @@ -641,6 +641,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 @@ -3723,7 +3724,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=1359971740 1.16 +DATE_WHEN_GENERATED=1360921109 1.17 1.18 ############################################################################### 1.19 # 1.20 @@ -28233,6 +28234,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 Thu Feb 07 12:32:32 2013 -0800 2.2 +++ b/common/autoconf/spec.gmk.in Fri Feb 15 10:40:46 2013 +0100 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 Thu Feb 07 12:32:32 2013 -0800 3.2 +++ b/common/autoconf/toolchain.m4 Fri Feb 15 10:40:46 2013 +0100 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"