From 11cd94d40ba1c9c19866f7bdc3e042731bfc4db9 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Thu, 21 Feb 2013 14:14:59 +0100 Subject: [PATCH 1/4] 8007387: "sed: RE error: illegal byte sequence" when building images on Mac Reviewed-by: tbell --- jdk/makefiles/Images.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/makefiles/Images.gmk b/jdk/makefiles/Images.gmk index 28322675559..bb737f88878 100644 --- a/jdk/makefiles/Images.gmk +++ b/jdk/makefiles/Images.gmk @@ -59,7 +59,7 @@ define process-doc-file $(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(MKDIR) -p $(@D) $(RM) $@ - $(SED) 's/$$//g' $< > $@ + LC_ALL=C $(SED) 's/$$//g' $< > $@ $(CHMOD) 444 $@ endef From d56a0e26bf7f4ec980d1b3daa561a01cfce08948 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Thu, 21 Feb 2013 14:16:15 +0100 Subject: [PATCH 2/4] 8008451: Make mac builds on 10.8 work on 10.7 Reviewed-by: ohair, ddehaven --- jdk/make/common/Defs-macosx.gmk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/jdk/make/common/Defs-macosx.gmk b/jdk/make/common/Defs-macosx.gmk index 951a18de90a..1b7aaa8ae20 100644 --- a/jdk/make/common/Defs-macosx.gmk +++ b/jdk/make/common/Defs-macosx.gmk @@ -406,10 +406,16 @@ endif LIB_LOCATION ?= $(LIBDIR) -# Adding these macros will make it an error to link to mac APIs newer than OS version 10.7 -ifeq ($(MACOSX_REQUIRED_VERSION),) - MACOSX_REQUIRED_VERSION:=1070 +# Setting these parameters makes it an error to link to macosx APIs that are +# newer than the given OS version and makes the linked binaries compatible even +# if built on a newer version of the OS. +# The expected format is X.Y.Z +ifeq ($(MACOSX_VERSION_MIN),) + MACOSX_VERSION_MIN=10.7.0 endif -MACOSX_OS_VERSION_CFLAGS := -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MACOSX_REQUIRED_VERSION) +# The macro takes the version with no dots, ex: 1070 +MACOSX_OS_VERSION_CFLAGS := -DMAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(MACOSX_VERSION_MIN)) \ + -mmacosx-version-min=$(MACOSX_VERSION_MIN) OTHER_CFLAGS += $(MACOSX_OS_VERSION_CFLAGS) OTHER_CXXFLAGS += $(MACOSX_OS_VERSION_CFLAGS) +OTHER_LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) From 53ae53637df110a5ae78b408fb495a5861c099ef Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Thu, 21 Feb 2013 14:23:12 +0100 Subject: [PATCH 3/4] 8007903: 8005583's changes to make/install-rules.gmk need to made to jdk/make/closed/InstallWrapper.gmk Reviewed-by: tbell, ohair --- jdk/make/common/shared/Compiler-msvc.gmk | 5 ++-- jdk/make/common/shared/Defs-utils.gmk | 34 +++++++++++++----------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/jdk/make/common/shared/Compiler-msvc.gmk b/jdk/make/common/shared/Compiler-msvc.gmk index c50706c5fbd..af7dd101f7c 100644 --- a/jdk/make/common/shared/Compiler-msvc.gmk +++ b/jdk/make/common/shared/Compiler-msvc.gmk @@ -28,6 +28,7 @@ # ifeq ($(PLATFORM), windows) +ifndef CONFIGURE_BUILD CC = $(COMPILER_PATH)cl CPP = $(COMPILER_PATH)cl CXX = $(COMPILER_PATH)cl @@ -36,7 +37,7 @@ ifeq ($(PLATFORM), windows) LINK = $(COMPILER_PATH)link LINK32 = $(LINK) DUMPBIN = $(COMPILER_PATH)dumpbin.exe - + # Fill in unknown values COMPILER_NAME=Unknown MSVC Compiler COMPILER_VERSION= @@ -87,6 +88,6 @@ ifeq ($(PLATFORM), windows) SHARED_LIBRARY_FLAG = -LD # RSC is always same as RC (Not sure who uses this RSC variable) RSC = $(RC) - +endif endif diff --git a/jdk/make/common/shared/Defs-utils.gmk b/jdk/make/common/shared/Defs-utils.gmk index 2d3104ddcbb..3bc0c6f4dc2 100644 --- a/jdk/make/common/shared/Defs-utils.gmk +++ b/jdk/make/common/shared/Defs-utils.gmk @@ -74,22 +74,24 @@ ifeq ($(PLATFORM),macosx) UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH) endif -# Utilities -ifdef CROSS_COMPILE_ARCH - AR = $(COMPILER_PATH)ar - AS = $(COMPILER_PATH)as - LD = $(COMPILER_PATH)ld - MCS = $(COMPILER_PATH)mcs - NM = $(COMPILER_PATH)nm - STRIP = $(COMPILER_PATH)strip -else - AR = $(UTILS_CCS_BIN_PATH)ar - AS = $(UTILS_CCS_BIN_PATH)as - LD = $(UTILS_CCS_BIN_PATH)ld - MCS = $(UTILS_CCS_BIN_PATH)mcs - NM = $(UTILS_CCS_BIN_PATH)nm - STRIP = $(UTILS_CCS_BIN_PATH)strip -endif +ifndef CONFIGURE_BUILD + # Utilities + ifdef CROSS_COMPILE_ARCH + AR = $(COMPILER_PATH)ar + AS = $(COMPILER_PATH)as + LD = $(COMPILER_PATH)ld + MCS = $(COMPILER_PATH)mcs + NM = $(COMPILER_PATH)nm + STRIP = $(COMPILER_PATH)strip + else + AR = $(UTILS_CCS_BIN_PATH)ar + AS = $(UTILS_CCS_BIN_PATH)as + LD = $(UTILS_CCS_BIN_PATH)ld + MCS = $(UTILS_CCS_BIN_PATH)mcs + NM = $(UTILS_CCS_BIN_PATH)nm + STRIP = $(UTILS_CCS_BIN_PATH)strip + endif +endif # CONFIGURE_BUILD ADB = $(UTILS_COMMAND_PATH)adb BASENAME = $(UTILS_COMMAND_PATH)basename From 86b53b9dd729b1fe83bcb059153d5a28e2a61bfb Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 28 Feb 2013 19:30:43 -0800 Subject: [PATCH 4/4] 8009196: install doesn't define $(AR) as /usr/ccs/bin/ar, results in ar: Command not found Reviewed-by: tbell --- jdk/make/common/shared/Defs-utils.gmk | 38 +++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/jdk/make/common/shared/Defs-utils.gmk b/jdk/make/common/shared/Defs-utils.gmk index 3bc0c6f4dc2..a210de015b7 100644 --- a/jdk/make/common/shared/Defs-utils.gmk +++ b/jdk/make/common/shared/Defs-utils.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -74,24 +74,24 @@ ifeq ($(PLATFORM),macosx) UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH) endif -ifndef CONFIGURE_BUILD - # Utilities - ifdef CROSS_COMPILE_ARCH - AR = $(COMPILER_PATH)ar - AS = $(COMPILER_PATH)as - LD = $(COMPILER_PATH)ld - MCS = $(COMPILER_PATH)mcs - NM = $(COMPILER_PATH)nm - STRIP = $(COMPILER_PATH)strip - else - AR = $(UTILS_CCS_BIN_PATH)ar - AS = $(UTILS_CCS_BIN_PATH)as - LD = $(UTILS_CCS_BIN_PATH)ld - MCS = $(UTILS_CCS_BIN_PATH)mcs - NM = $(UTILS_CCS_BIN_PATH)nm - STRIP = $(UTILS_CCS_BIN_PATH)strip - endif -endif # CONFIGURE_BUILD +# Utilities +ifdef CROSS_COMPILE_ARCH + AR = $(COMPILER_PATH)ar + AS = $(COMPILER_PATH)as + LD = $(COMPILER_PATH)ld + MCS = $(COMPILER_PATH)mcs + NM = $(COMPILER_PATH)nm + STRIP = $(COMPILER_PATH)strip +endif + +ifeq ($(PLATFORM),solaris) + AR = $(UTILS_CCS_BIN_PATH)ar + AS = $(UTILS_CCS_BIN_PATH)as + LD = $(UTILS_CCS_BIN_PATH)ld + MCS = $(UTILS_CCS_BIN_PATH)mcs + NM = $(UTILS_CCS_BIN_PATH)nm + STRIP = $(UTILS_CCS_BIN_PATH)strip +endif ADB = $(UTILS_COMMAND_PATH)adb BASENAME = $(UTILS_COMMAND_PATH)basename