Mercurial > hg > openjdk > jdk7 > jdk
changeset 4324:647b031200f0
Merge
| author | asaha |
|---|---|
| date | Fri, 06 May 2011 14:33:44 -0700 |
| parents | 49244980d692 (current diff) ce34293145b1 (diff) |
| children | 92b5197e9ff5 |
| files | |
| diffstat | 5 files changed, 9 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Program.gmk Thu May 05 22:29:05 2011 -0700 +++ b/make/common/Program.gmk Fri May 06 14:33:44 2011 -0700 @@ -55,10 +55,13 @@ program: $(ACTUAL_PROGRAM) -# reuse the mapfiles in the launcher's directory, the same should -# be applicable to the tool launchers as well. -FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) -include $(BUILDDIR)/common/Mapfile-vers.gmk +# Work-around for missing processor specific mapfiles +ifndef CROSS_COMPILE_ARCH + # reuse the mapfiles in the launcher's directory, the same should + # be applicable to the tool launchers as well. + FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) + include $(BUILDDIR)/common/Mapfile-vers.gmk +endif include $(JDK_TOPDIR)/make/common/Rules.gmk
--- a/make/common/shared/Defs-utils.gmk Thu May 05 22:29:05 2011 -0700 +++ b/make/common/shared/Defs-utils.gmk Fri May 06 14:33:44 2011 -0700 @@ -109,6 +109,8 @@ GDB = $(UTILS_USR_BIN_PATH)gdb GREP = $(UTILS_COMMAND_PATH)grep GUNZIP = $(UTILS_COMMAND_PATH)gunzip +# GZIP is used for solaris. Linux and windows use tar czf +GZIP = $(UTILS_COMMAND_PATH)gzip HEAD = $(UTILS_USR_BIN_PATH)head HG = hg ID = $(UTILS_COMMAND_PATH)id
--- a/make/common/shared/Defs-versions.gmk Thu May 05 22:29:05 2011 -0700 +++ b/make/common/shared/Defs-versions.gmk Fri May 06 14:33:44 2011 -0700 @@ -72,10 +72,6 @@ # REQUIRED_DXSDK_VER # Windows only: The version of DirectX SDK expected. # -# REQUIRED_FREE_SPACE -# The minimum disk space needed as determined by running 'du -sk' on a fully -# built workspace. -# # REQUIRED_FREETYPE_VERSION # If we are using freetype, the freetype version expected. # @@ -131,11 +127,6 @@ REQUIRED_OS_VERSION = 5.10 REQUIRED_OS_VARIANT_NAME = Solaris REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION) - ifeq ($(ARCH_FAMILY), sparc) - REQUIRED_FREE_SPACE = 1300000 - else - REQUIRED_FREE_SPACE = 1040000 - endif REQUIRED_COMPILER_NAME = Sun Studio 12 Update 1 REQUIRED_COMPILER_VERSION = SS12u1 # Cross-compilation compiler versions are target specific @@ -157,7 +148,6 @@ REQUIRED_OS_VERSION = 2.6 REQUIRED_OS_VARIANT_NAME = Fedora REQUIRED_OS_VARIANT_VERSION = 9 - REQUIRED_FREE_SPACE = 1460000 REQUIRED_ALSA_VERSION = 0.9.1 REQUIRED_COMPILER_NAME = GCC4 REQUIRED_COMPILER_VERSION = GCC4 @@ -187,7 +177,6 @@ REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION) REQUIRED_CYGWIN_VER = 4.0 REQUIRED_MKS_VER = 6.1 - REQUIRED_FREE_SPACE = 500000 REQUIRED_DXSDK_VER = 0x0900 ifeq ($(CC_VERSION),msvc) REQUIRED_COMPILER_NAME = Visual Studio 10
--- a/make/common/shared/Sanity-Settings.gmk Thu May 05 22:29:05 2011 -0700 +++ b/make/common/shared/Sanity-Settings.gmk Fri May 06 14:33:44 2011 -0700 @@ -192,8 +192,6 @@ ALL_SETTINGS+=$(call addRequiredVersionSetting,OS_VERSION) ALL_SETTINGS+=$(call addOptionalSetting,OS_VARIANT_NAME) ALL_SETTINGS+=$(call addOptionalSetting,OS_VARIANT_VERSION) -ALL_SETTINGS+=$(call addRequiredSetting,TEMP_FREE_SPACE) -ALL_SETTINGS+=$(call addRequiredSetting,FREE_SPACE) ALL_SETTINGS+=$(call addRequiredSetting,MB_OF_MEMORY)
--- a/make/common/shared/Sanity.gmk Thu May 05 22:29:05 2011 -0700 +++ b/make/common/shared/Sanity.gmk Fri May 06 14:33:44 2011 -0700 @@ -69,8 +69,6 @@ # Settings and rules to validate the JDK build environment. ifeq ($(PLATFORM), solaris) - FREE_SPACE := $(shell $(DF) -b $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$2;}') - TEMP_FREE_SPACE := $(shell $(DF) -b $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$2;}') # What kind of system we are using (Variations are Solaris and OpenSolaris) OS_VERSION := $(shell uname -r) OS_VARIANT_NAME := $(strip $(shell head -1 /etc/release | awk '{print $$1;}') ) @@ -88,8 +86,6 @@ endif ifeq ($(PLATFORM), linux) - FREE_SPACE := $(shell $(DF) --sync -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}') - TEMP_FREE_SPACE := $(shell $(DF) --sync -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}') # What kind of system we are using (Variation is the Linux vendor) OS_VERSION := $(shell uname -r) OS_VARIANT_NAME := $(shell \ @@ -118,8 +114,6 @@ endif ifeq ($(PLATFORM), windows) - FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}') - TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}') # 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 WINDOWS_MAPPING-5.0 := Windows2000 @@ -715,18 +709,6 @@ " Either obtain these permissions or set ALT_OUTPUTDIR. \n" \ "" >> $(ERROR_FILE) ; \ fi - @# - @# OUTPUTDIR must have enough free space... - @# - @if [ $(FREE_SPACE) -lt $(REQUIRED_FREE_SPACE) ]; then \ - $(ECHO) "WARNING: You may not have enough free space in your OUTPUTDIR. The \n" \ - " current value of OUTPUTDIR is \n" \ - " $(OUTPUTDIR) \n" \ - " You need "$(REQUIRED_FREE_SPACE)" Kbytes free on this device to build \n" \ - " and it appears that only "$(FREE_SPACE)" Kbytes are free. \n" \ - " Either obtain more space or set ALT_OUTPUTDIR to a larger disk. \n" \ - "" >> $(WARNING_FILE) ; \ - fi ###################################################### # if specified, ALT_BOOTDIR must point to non-relative path if set