diff options
Diffstat (limited to 'lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk')
| -rw-r--r-- | lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk b/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk index 6a731916d42..9f328ce0cd2 100644 --- a/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk +++ b/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk @@ -1,9 +1,20 @@ -$NetBSD: patch-corba_make_common_shared_Platform.gmk,v 1.1 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-corba_make_common_shared_Platform.gmk,v 1.2 2013/06/23 17:39:43 jperkin Exp $ Avoid warnings when building in a zone. ---- corba/make/common/shared/Platform.gmk.orig 2013-02-20 04:35:29.000000000 +0000 +Disable multiarch support. + +--- corba/make/common/shared/Platform.gmk.orig 2013-06-21 13:12:15.317583446 +0000 +++ corba/make/common/shared/Platform.gmk +@@ -115,7 +115,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) + ARCH := $(shell isainfo -n) + # ISA_DIR is used to locate 64-bit specific libraries which are generally + # in the same general place as other libraries under the ./$(ARCH) directory +- ISA_DIR = /$(ARCH) ++ NOMULTIARCHISA_DIR = /$(ARCH) + endif + # Need to maintain the jre/lib/i386 location for 32-bit Intel + ifeq ($(ARCH), i586) @@ -143,7 +143,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) REQUIRED_FREE_SPACE=1040000 endif |