changeset 4633:4868a820411b

7123022: Fixing some Mac sanity checks Reviewed-by: swingler
author ohair
date Mon, 19 Dec 2011 18:15:06 -0800
parents d0385c0922ac
children 12819477ce5a
files make/common/shared/Defs-utils.gmk make/common/shared/Defs-versions.gmk make/common/shared/Platform.gmk make/common/shared/Sanity.gmk
diffstat 4 files changed, 22 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Defs-utils.gmk	Thu Dec 15 12:44:21 2011 -0800
+++ b/make/common/shared/Defs-utils.gmk	Mon Dec 19 18:15:06 2011 -0800
@@ -243,9 +243,11 @@
   TOUCH        = $(UTILS_USR_BIN_PATH)touch
   TRUE         = $(UTILS_USR_BIN_PATH)true
   UNAME        = $(UTILS_USR_BIN_PATH)uname
-  NAWK       = $(UTILS_USR_BIN_PATH)awk
-  UNZIPSFX   = $(UTILS_USR_BIN_PATH)unzipsfx
-  ZIPEXE     = $(UTILS_USR_BIN_PATH)zip
-  CPIO       = $(UTILS_USR_BIN_PATH)cpio
-  TAR        = $(UTILS_USR_BIN_PATH)tar
+  NAWK         = $(UTILS_USR_BIN_PATH)awk
+  UNZIPSFX     = $(UTILS_USR_BIN_PATH)unzipsfx
+  ZIPEXE       = $(UTILS_USR_BIN_PATH)zip
+  CPIO         = $(UTILS_USR_BIN_PATH)cpio
+  TAR          = $(UTILS_USR_BIN_PATH)tar
+  # Builtin shell command, no -e option needed
+  ECHO         = echo
 endif
--- a/make/common/shared/Defs-versions.gmk	Thu Dec 15 12:44:21 2011 -0800
+++ b/make/common/shared/Defs-versions.gmk	Mon Dec 19 18:15:06 2011 -0800
@@ -172,8 +172,12 @@
 # Mac specific
 ifeq ($(PLATFORM), macosx)
   REQUIRED_OS_NAME            = Darwin
-  REQUIRED_OS_VERSION         = 10.6
-  REQUIRED_FREE_SPACE         = 1460000
+  REQUIRED_OS_VERSION         = 11.2
+  REQUIRED_OS_VARIANT_NAME    = MacOSX
+  REQUIRED_OS_VARIANT_VERSION = 10.7.2
+  REQUIRED_COMPILER_NAME      = GCC4
+  REQUIRED_COMPILER_VERSION   = GCC4
+  REQUIRED_CC_VER             = 4.2.1
 endif
 
 # Windows specific
--- a/make/common/shared/Platform.gmk	Thu Dec 15 12:44:21 2011 -0800
+++ b/make/common/shared/Platform.gmk	Mon Dec 19 18:15:06 2011 -0800
@@ -228,7 +228,8 @@
   PLATFORM = macosx
   OS_NAME = darwin
   OS_VENDOR = Apple
-  REQUIRED_OS_VERSION = 8.0
+  GB_OF_MEMORY := $(shell system_profiler SPHardwareDataType | fgrep Memory: | awk '{print $$2}')
+  MB_OF_MEMORY := $(shell expr ${GB_OF_MEMORY} '*' 1024)
 endif
 
 # Platform settings specific to BSD/Mac OS X
@@ -294,9 +295,6 @@
 
   # Suffix for file bundles used in previous release
   BUNDLE_FILE_SUFFIX=.tar.gz
-  # Minimum disk space needed as determined by running 'du -sk' on 
-  #    a fully built workspace.
-  REQUIRED_FREE_SPACE=1500000
   # How much RAM does this machine have:
 endif
 
--- a/make/common/shared/Sanity.gmk	Thu Dec 15 12:44:21 2011 -0800
+++ b/make/common/shared/Sanity.gmk	Mon Dec 19 18:15:06 2011 -0800
@@ -113,6 +113,13 @@
   ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
 endif
 
+ifeq ($(PLATFORM), macosx)
+  # What kind of system we are using
+  OS_VERSION := $(shell uname -r)
+  OS_VARIANT_NAME := MacOSX
+  OS_VARIANT_VERSION := $(shell sw_vers -productVersion)
+endif
+
 ifeq ($(PLATFORM), windows)
   # Windows 2000 is 5.0, Windows XP is 5.1, Windows 2003 is 5.2
   #    Assume 5.0 (Windows 2000) if systeminfo does not help