- sync w/ lang/openjdk7

- add basic support for NetBSD/sparc64
- can use either cups-1.5 or cups-2.0 headers for build
- rerun configure after the 1st build pass, since boot jdk major changes

2 files changed, 35 insertions, 1 deletions

diff --git a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
index 77446b50647..2910f6576c6 100644
--- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
+++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
@@ -1,7 +1,25 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.2 2015/02/10 08:20:27 tnn Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00 tnn Exp $
 
 --- common/autoconf/generated-configure.sh.orig	2015-02-02 15:31:06.000000000 +0000
 +++ common/autoconf/generated-configure.sh
+@@ -6859,7 +6859,7 @@ test -n "$target_alias" &&
+       VAR_CPU_BITS=32
+       VAR_CPU_ENDIAN=big
+       ;;
+-    sparcv9)
++    sparcv9|sparc64)
+       VAR_CPU=sparcv9
+       VAR_CPU_ARCH=sparc
+       VAR_CPU_BITS=64
+@@ -6990,7 +6990,7 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI
+       VAR_CPU_BITS=32
+       VAR_CPU_ENDIAN=big
+       ;;
+-    sparcv9)
++    sparcv9|sparc64)
+       VAR_CPU=sparcv9
+       VAR_CPU_ARCH=sparc
+       VAR_CPU_BITS=64
 @@ -8379,9 +8379,9 @@ done
    # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
    if test "x$MAKE" != x; then
diff --git a/lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk b/lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk
new file mode 100644
index 00000000000..35e6c341dec
--- /dev/null
+++ b/lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk
@@ -0,0 +1,16 @@
+$NetBSD: patch-jdk_make_CompileLaunchers.gmk,v 1.1 2015/02/12 06:20:00 tnn Exp $
+
+Change Sun Studio compiler flag to GCC equivalent.
+(it is probably safe to remove the flag since we use the Zero port.)
+
+--- jdk/make/CompileLaunchers.gmk.orig	2015-02-02 15:37:11.000000000 +0000
++++ jdk/make/CompileLaunchers.gmk
+@@ -452,7 +452,7 @@ else
+ endif
+ 
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+-  UNPACKEXE_CFLAGS += -xregs=no%appl
++  UNPACKEXE_CFLAGS += -mno-app-regs
+   UNPACKEXE_LDFLAGS_solaris += -xmemalign=4s
+ endif
+