From 679f58d07c188dd6c784ac36dd65f567a69938d7 Mon Sep 17 00:00:00 2001 From: David Holmes Date: Wed, 4 May 2011 22:16:28 -0400 Subject: [PATCH 1/2] 7041284: arm/ppc Missing launcher mapfiles prevent build Disable use of launcher mapfiles when cross-compiling Reviewed-by: ohair, ksrini --- jdk/make/common/Program.gmk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk index 9fdde6d9745..38adb13b052 100644 --- a/jdk/make/common/Program.gmk +++ b/jdk/make/common/Program.gmk @@ -55,10 +55,13 @@ program_default_rule: all 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 From e20a4c4a39c51aeb64faff5959053bde58976777 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Thu, 5 May 2011 18:05:24 -0700 Subject: [PATCH 2/2] 7026163: gzip tar files Reviewed-by: katleman --- jdk/make/common/shared/Defs-utils.gmk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jdk/make/common/shared/Defs-utils.gmk b/jdk/make/common/shared/Defs-utils.gmk index a5b1802c46b..1cebe93ca5b 100644 --- a/jdk/make/common/shared/Defs-utils.gmk +++ b/jdk/make/common/shared/Defs-utils.gmk @@ -109,6 +109,8 @@ FMT = $(UTILS_COMMAND_PATH)fmt 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