diff options
Diffstat (limited to 'lang/openjdk7/patches/patch-ao')
| -rw-r--r-- | lang/openjdk7/patches/patch-ao | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/lang/openjdk7/patches/patch-ao b/lang/openjdk7/patches/patch-ao index 85679e0f284..9449d60e8bd 100644 --- a/lang/openjdk7/patches/patch-ao +++ b/lang/openjdk7/patches/patch-ao @@ -1,9 +1,29 @@ -$NetBSD: patch-ao,v 1.3 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-ao,v 1.4 2013/06/23 17:39:43 jperkin Exp $ Support rhino. ---- jdk/make/common/Release.gmk.orig 2013-05-29 03:57:57.000000000 +0000 +Disable SunOS multiarch. + +--- jdk/make/common/Release.gmk.orig 2013-06-21 13:12:13.781215177 +0000 +++ jdk/make/common/Release.gmk +@@ -67,7 +67,7 @@ EXPORTED_PRIVATE_PKGS = com.sun.servicet + # 64-bit solaris has a few special cases. We define the variable + # SOLARIS64 for use in this Makefile to easily test those cases + ifeq ($(PLATFORM), solaris) +- ifeq ($(ARCH_DATA_MODEL), 64) ++ ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64) + SOLARIS64 = true + IMAGE_BINDIR = bin/$(ARCH) + endif +@@ -227,7 +227,7 @@ endif + INITIAL_IMAGE_JRE=initial-image-jre + INITIAL_IMAGE_JDK=initial-image-jdk + ifeq ($(PLATFORM), solaris) +- ifeq ($(ARCH_DATA_MODEL), 64) ++ ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64) + INITIAL_IMAGE_JRE=initial-image-jre-sol64 + INITIAL_IMAGE_JDK=initial-image-jdk-sol64 + endif @@ -842,6 +842,7 @@ initial-image-jre:: initial-image-jre-se $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar |