From 4343030646454237deb04e7e6a6c8d3871306281 Mon Sep 17 00:00:00 2001 From: tnn Date: Thu, 12 Feb 2015 06:18:17 +0000 Subject: - 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 --- lang/openjdk7/Makefile | 16 ++++++---------- lang/openjdk7/bootstrap.mk | 9 ++++++++- lang/openjdk7/distinfo | 4 ++-- lang/openjdk7/options.mk | 6 +++--- lang/openjdk7/patches/patch-ae | 22 ---------------------- ...atch-hotspot_src_share_vm_runtime_arguments.cpp | 17 +++++++++++++++++ 6 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 lang/openjdk7/patches/patch-ae create mode 100644 lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp (limited to 'lang') diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 1354a3671fb..abc68cdc6a9 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2015/02/10 14:57:35 tnn Exp $ +# $NetBSD: Makefile,v 1.93 2015/02/12 06:18:17 tnn Exp $ DISTNAME= openjdk-1.7.76-20150127 PKGNAME= openjdk7-1.7.76 @@ -61,7 +61,7 @@ MAKE_ENV+= CLASSPATH= BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/} BUILD_ARCH= ${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/:S/sparc64/sparcv9/} -LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/} +LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/} BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH} LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} @@ -193,10 +193,6 @@ post-extract: cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH} .endif -.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) -ALL_ENV+= LDFLAGS_LIBGCC=-lgcc_s -.endif - do-build: ${WRKDIR}/stage3-done # stage 1 builds a native JDK using the bootstrap binaries @@ -205,17 +201,17 @@ ${WRKDIR}/stage1-done: rm -rf ${ALT_BOOTDIR} cd ${BUILDDIR} && mv j2sdk-image ${ALT_BOOTDIR} mv ${BUILDDIR} ${BUILDDIR}-stage1 - touch ${WRKDIR}/stage1-done + 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} ${JDK_MAKE_TARGET} touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep - touch ${WRKDIR}/stage2-done + 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 && \ @@ -258,6 +254,6 @@ MAKE_ENV+= STRIP=${PREFIX}/bin/gstrip .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/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk index b36406ca2d9..c296ead347e 100644 --- a/lang/openjdk7/bootstrap.mk +++ b/lang/openjdk7/bootstrap.mk @@ -1,6 +1,7 @@ -# $NetBSD: bootstrap.mk,v 1.14 2015/01/09 16:29:04 rumko Exp $ +# $NetBSD: bootstrap.mk,v 1.15 2015/02/12 06:18:17 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/openjdk7/distinfo b/lang/openjdk7/distinfo index 011ae4a3b86..2fad41ea43f 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.72 2015/02/10 19:31:53 tnn Exp $ +$NetBSD: distinfo,v 1.73 2015/02/12 06:18:17 tnn Exp $ SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 @@ -46,7 +46,6 @@ SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6 SHA1 (patch-aa) = 33197f638bb8516e3ecc465e32e15db5381c2aae SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998 SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 -SHA1 (patch-ae) = 843f05cfe8f18d080cae80eed92d9ad89a5c0917 SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88 SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2 SHA1 (patch-ak) = a8ce55038ee8755cf69a23bf77c4ea79466a8897 @@ -99,6 +98,7 @@ SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68 SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 1bc67dd849eec122162b71f21d204e5489555738 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553 +SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 797e0382e5d67180757070ae5b76577809f7ad15 SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e diff --git a/lang/openjdk7/options.mk b/lang/openjdk7/options.mk index 307baa1aceb..72a63f7a5c5 100644 --- a/lang/openjdk7/options.mk +++ b/lang/openjdk7/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2015/02/10 00:26:49 tnn Exp $ +# $NetBSD: options.mk,v 1.9 2015/02/12 06:18:17 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk7 PKG_SUPPORTED_OPTIONS= debug jre-jce jdk-zero-vm x11 @@ -71,9 +71,9 @@ PLIST_VARS+= native .if !empty(PKG_OPTIONS:Mjdk-zero-vm) MAKE_ENV+= ZERO_BUILD=true # valid are i386 / amd64 / sparc* / ppc32 / ppc64 -MAKE_ENV+= ZERO_LIBARCH=${MACHINE_ARCH:S/x86_64/amd64/} +MAKE_ENV+= ZERO_LIBARCH=${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/} # valid are IA32 / AMD64 / SPARC / PPC32 / PPC64 -MAKE_ENV+= ZERO_ARCHDEF=${MACHINE_ARCH:S/i386/IA32/:S/x86_64/AMD64/} +MAKE_ENV+= ZERO_ARCHDEF=${MACHINE_ARCH:S/i386/IA32/:S/x86_64/AMD64/:S/sparc64/SPARC/} .include "../../mk/endian.mk" MAKE_ENV+= ZERO_ENDIANNESS=${MACHINE_ENDIAN} .include "../../devel/libffi/buildlink3.mk" 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!"); -- cgit v1.2.3