diff options
author | tnn <tnn@pkgsrc.org> | 2015-02-12 06:18:17 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2015-02-12 06:18:17 +0000 |
commit | 34253fee265fedb9a4789ed4220b27a343449e10 (patch) | |
tree | 81bfd6656e45c175569abd5d8b82a30907112fcc /lang/openjdk7/patches | |
parent | f6ed59166dea09a3ec972dceab9c2a5dfe0bb4d8 (diff) | |
download | pkgsrc-34253fee265fedb9a4789ed4220b27a343449e10.tar.gz |
- Add basic support for NetBSD/sparc64
- drop obsolete patch; libgcc_s linking is handled by the package
- can use either cups-1.5 or cups-2.0 headers for build
Diffstat (limited to 'lang/openjdk7/patches')
-rw-r--r-- | lang/openjdk7/patches/patch-ae | 22 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp | 17 |
2 files changed, 17 insertions, 22 deletions
diff --git a/lang/openjdk7/patches/patch-ae b/lang/openjdk7/patches/patch-ae deleted file mode 100644 index cbe42ab3ab4..00000000000 --- a/lang/openjdk7/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.6 2014/09/13 14:35:25 joerg Exp $ - -Additional BSD support. - ---- hotspot/make/bsd/makefiles/gcc.make.orig 2013-05-29 03:57:57.000000000 +0000 -+++ hotspot/make/bsd/makefiles/gcc.make -@@ -242,6 +242,15 @@ MAPFLAG = -Xlinker --version-script=FILE - # - # Shared Library - # -+ -+ifeq ($(OS_VENDOR), NetBSD) -+# XXX tnn fixme: -lgcc_s seems to be needed on NetBSD. -+LFLAGS += ${LDFLAGS_LIBGCC} -+endif -+ -+# XXX tnn fixme: this probably should go someplace else. -+CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -+ - ifeq ($(OS_VENDOR), Darwin) - # Standard linker flags - LFLAGS += diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp new file mode 100644 index 00000000000..f102f6bd44f --- /dev/null +++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-hotspot_src_share_vm_runtime_arguments.cpp,v 1.1 2015/02/12 06:18:17 tnn Exp $ + +Fix problem with ZERO build. + +arguments.cpp:2089:9: error: 'is_sun4v' is not a member of 'VM_Version' + +--- hotspot/src/share/vm/runtime/arguments.cpp.orig 2015-01-26 15:21:48.000000000 +0000 ++++ hotspot/src/share/vm/runtime/arguments.cpp +@@ -2086,7 +2086,7 @@ bool Arguments::check_vm_args_consistenc + // Issue a stern warning if the user has explicitly set + // UseMemSetInBOT (it is known to cause issues), but allow + // use for experimentation and debugging. +- if (VM_Version::is_sun4v() && UseMemSetInBOT) { ++ if (UseMemSetInBOT) { + assert(!FLAG_IS_DEFAULT(UseMemSetInBOT), "Error"); + warning("Experimental flag -XX:+UseMemSetInBOT is known to cause instability" + " on sun4v; please understand that you are using at your own risk!"); |