summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/openjdk8/Makefile32
-rw-r--r--lang/openjdk8/bootstrap.mk9
-rw-r--r--lang/openjdk8/distinfo5
-rw-r--r--lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh20
-rw-r--r--lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk16
5 files changed, 66 insertions, 16 deletions
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index f2e65f840a9..fb1618f7905 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/02/10 11:44:32 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2015/02/12 06:19:59 tnn Exp $
DISTNAME= openjdk-1.8.31-20150207
PKGNAME= openjdk8-1.8.31
@@ -60,13 +60,16 @@ CHECK_PORTABILITY_SKIP+= hotspot/test/runtime/*/*.sh
MAKE_ENV+= JAVA_HOME=
MAKE_ENV+= CLASSPATH=
-BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}-${MACHINE_ARCH:S/i386/x86/}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
-LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/jli:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server
+BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}
+BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/}
+LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/}
+BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
+LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server
CONFIGURE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk8/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk8/jre/lib/${LIBDIR_ARCH}
-PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/}
+PLIST_SUBST+= ARCH=${LIBDIR_ARCH}
PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS}
.include "../../mk/compiler.mk"
@@ -132,7 +135,7 @@ post-extract:
${LN} -s ${JDK_BOOTDIR}/bin/native2ascii ${ALT_BOOTDIR}/bin
${LN} -s ${JDK_BOOTDIR}/bin/rmic ${ALT_BOOTDIR}/bin
.elif ${OPSYS} == "NetBSD" && exists(${.CURDIR}/libs)
- cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}
+ cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}
.endif
do-build: ${WRKDIR}/stage3-done
@@ -145,16 +148,21 @@ ${WRKDIR}/stage1-done:
.for d in corba hotspot jaxp jaxws langtools tmp
mv ${BUILDDIR}/${d} ${BUILDDIR}/${d}-stage1
.endfor
- touch ${WRKDIR}/stage1-done
+ touch ${.TARGET}
+
+# stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now
+${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done
+ ${RECURSIVE_MAKE} ${MAKEFLAGS} do-configure
+ touch ${.TARGET}
# stage 2 rebuilds the JDK using native tools
-${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done
- ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} images
- touch ${WRKDIR}/stage2-done
+${WRKDIR}/stage2-done: ${WRKDIR}/stage1_5-done
+ ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_ENV_STAGE2} ${MAKE_PROGRAM} images
+ touch ${.TARGET}
# stage 3 builds third party add-ons
${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out
- touch ${WRKDIR}/stage3-done
+ touch ${.TARGET}
${WRKDIR}/cacerts.out:
mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \
@@ -192,6 +200,6 @@ TOOLS_PLATFORM.unzip=
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
BUILDLINK_DEPMETHOD.cups?= build
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
.include "../../mk/java-env.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/openjdk8/bootstrap.mk b/lang/openjdk8/bootstrap.mk
index 3158e588a3a..af7d1026097 100644
--- a/lang/openjdk8/bootstrap.mk
+++ b/lang/openjdk8/bootstrap.mk
@@ -1,6 +1,7 @@
-# $NetBSD: bootstrap.mk,v 1.1 2015/02/08 08:41:25 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.2 2015/02/12 06:19:59 tnn Exp $
ONLY_FOR_PLATFORM= NetBSD-[567].*-i386 NetBSD-[567].*-x86_64
+ONLY_FOR_PLATFORM+= NetBSD-7.*-sparc64
ONLY_FOR_PLATFORM+= DragonFly-[23].*-* SunOS-*-* FreeBSD-10.*-x86_64
BOOT.nb5-i386= bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2
@@ -9,6 +10,7 @@ BOOT.nb6-i386= bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2
BOOT.nb6-amd64= bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2
BOOT.nb7-i386= bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2
BOOT.nb7-amd64= bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2
+BOOT.nb7-sparc64= bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz
BOOT.dfly3.6-amd64= bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2
BOOT.dfly3.8-amd64= bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2
BOOT.fbsd10-amd64= bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2
@@ -43,6 +45,11 @@ DISTFILES+= ${BOOT.nb7-amd64}
EXTRACT_ONLY+= ${BOOT.nb7-amd64}
.endif
+.if !empty(MACHINE_PLATFORM:MNetBSD-7*-sparc64) || make(distinfo)
+#DISTFILES+= ${BOOT.nb7-sparc64}
+#EXTRACT_ONLY+= ${BOOT.nb7-sparc64}
+.endif
+
.if !empty(MACHINE_PLATFORM:MDragonFly-3.6*-x86_64) || make(distinfo)
DISTFILES+= ${BOOT.dfly3.6-amd64}
EXTRACT_ONLY+= ${BOOT.dfly3.6-amd64}
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index b53fd0c45f8..c5a46606831 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2015/02/10 11:44:32 tnn Exp $
+$NetBSD: distinfo,v 1.5 2015/02/12 06:19:59 tnn Exp $
SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337
RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157
@@ -40,7 +40,7 @@ SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800
SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
-SHA1 (patch-common_autoconf_generated-configure.sh) = 24214799573cc3ea99a867ad03a4c4209750e68d
+SHA1 (patch-common_autoconf_generated-configure.sh) = abfec0410c3d239a42e44d7f2619cceb02622769
SHA1 (patch-common_autoconf_spec.gmk.in) = 8fda7fac31444997615a8f8bfe22d5b2df01ad3c
SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = de9d1f2c97df16119de56abb5e900f705813e514
@@ -48,6 +48,7 @@ SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = 4b9a92abd0a91d81b5c34b7fbc9
SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = c34887b4bf0873c70a44adaaa9be38614603e1d4
SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = f38d3ea8002bc8c58d1cf05e70424858dabd2991
SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
+SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 76bae0aab5528a6c020d2fdd5ba7c1ffa132aca2
SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
SHA1 (patch-jdk_make_Images.gmk) = 3ce8b5ee63cb9e4a7a32294f52191bb81a695723
SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = 27c33019f28d38efc0ae2c019b3e6e44863e8253
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
+
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 19:36:02 +0000