diff --git a/openjdk11/Makefile b/openjdk11/Makefile index 313f7dfa..c7046d5c 100644 --- a/openjdk11/Makefile +++ b/openjdk11/Makefile @@ -1,7 +1,7 @@ # $NetBSD$ -PKGNAME= openjdk11-11.0.9 -DISTNAME= 4397fa4529b2 +PKGNAME= openjdk11-11.0.10 +DISTNAME= 8b3498547395 CATEGORIES= lang MASTER_SITES= https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/ EXTRACT_SUFX= .tar.bz2 @@ -21,12 +21,14 @@ JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jps jstack \ BUILD_DEPENDS+= mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts +DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf + BUILD_TARGET= images GNU_CONFIGURE= yes CONFIG_SHELL= bash USE_LANGUAGES= c c++ -USE_TOOLS+= autoconf bash gmake pax unzip:run zip:run +USE_TOOLS+= autoconf bash gmake pax pkg-config unzip:run zip:run UNLIMIT_RESOURCES= datasize stacksize @@ -37,17 +39,23 @@ CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q} CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM:Q} +CONFIGURE_ARGS+= --with-freetype=system +CONFIGURE_ARGS+= --with-giflib=system +CONFIGURE_ARGS+= --with-harfbuzz=system +CONFIGURE_ARGS+= --with-lcms=system CONFIGURE_ARGS+= --with-libjpeg=system +CONFIGURE_ARGS+= --with-libpng=system CONFIGURE_ARGS+= --with-zlib=system -CONFIGURE_ARGS+= --with-giflib=bundled +CONFIGURE_ARGS+= --with-x=yes CONFIGURE_ARGS+= --with-cups-include=${BUILDLINK_PREFIX.cups-base}/include CONFIGURE_ARGS+= --with-fontconfig=${BUILDLINK_PREFIX.fontconfig} -CONFIGURE_ARGS+= --with-freetype=system -CONFIGURE_ARGS+= --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib CONFIGURE_ARGS+= --with-freetype-include=${BUILDLINK_PREFIX.freetype2}/include -CONFIGURE_ARGS+= --with-jobs=${MAKE_JOBS:U1} +CONFIGURE_ARGS+= --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib +CONFIGURE_ARGS+= --x-includes=${X11BASE}/include +CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib CONFIGURE_ARGS+= --with-num-cores=${MAKE_JOBS:U1} CONFIGURE_ARGS+= --with-cacerts-file=${CACERTS_STORE} +CONFIGURE_ARGS+= --enable-unlimited-crypto CONFIGURE_ARGS+= --disable-precompiled-headers CONFIGURE_ARGS+= --disable-ccache CONFIGURE_ARGS+= --with-extra-cflags=${CFLAGS:Q} @@ -59,18 +67,14 @@ CONFIGURE_ARGS+= --with-debug-level=release CONFIGURE_ARGS+= --disable-warnings-as-errors CONFIGURE_ARGS+= --with-toolchain-type=gcc -CONFIGURE_ARGS+= --disable-gtest CONFIGURE_ARGS+= --disable-hotspot-gtest # Causes unresolved symbols (GCId::print_prefix, LogTagSet::LogTagSet) that are # proving difficult to track down. CONFIGURE_ARGS.SunOS+= --disable-dtrace -MAKE_JOBS_SAFE= no # Set manually - -# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user. -MAKE_ENV+= JAVA_HOME= -#MAKE_ENV+= CLASSPATH= +# The build process rejects make -j, we pass --with-num-cores above instead. +MAKE_JOBS_SAFE= no BUILDLINK_PASSTHRU_RPATHDIRS+= ${JAVA_HOME}/lib @@ -105,6 +109,7 @@ IMAGEJDKDIR= ${WRKSRC}/build/${SERVER_DIR}/images/jdk PLIST_SUBST+= JAVA_NAME=${JAVA_NAME} PRINT_PLIST_AWK+= { gsub(/${JAVA_NAME}/, "$${JAVA_NAME}") } +PRINT_PLIST_AWK+= /man\/.*gz/ { gsub(/\.gz$$/, "") } pre-configure: ${CACERTS_STORE} ${CACERTS_STORE}: @@ -145,7 +150,10 @@ bootstrap: install done for lib in libX11.so.6 libXau.so.6 libXdmcp.so.6 libXext.so.0 \ libXi.so.6 libXrender.so.1 libXtst.so.6 libbz2.so.0 \ - libfreetype.so.6 libpng16.so.16 libxcb.so.1 libz.so.1; do \ + libfreetype.so.6 libgif.so.7 libglib-2.0.so.0 \ + libgraphite2.so.3 libharfbuzz.so.0 libiconv.so.2 \ + libintl.so.8 libjpeg.so.8 liblcms2.so.2 libpcre.so.1 \ + libpng16.so.16 libxcb.so.1 libz.so.1; do \ ${CP} ${PREFIX}/lib/$${lib} \ ${WRKDIR}/bootstrap/${JAVA_NAME}/lib/pkgsrc/; \ done @@ -168,15 +176,24 @@ bootstrap: install ${TAR} -zcf ${PKGNAME}-x86_64-sun-solaris.tar.gz ${JAVA_NAME}) .endif -.include "options.mk" - .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" +.include "../../fonts/harfbuzz/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/giflib/buildlink3.mk" +.include "../../graphics/lcms2/buildlink3.mk" # Headers from CUPS are required to build the native implementation of # sun.print.* which is used by java.awt.print. BUILDLINK_DEPMETHOD.cups-base?= build .include "../../print/cups-base/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXi/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" +BUILDLINK_DEPMETHOD.libXt?= build +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXtst/buildlink3.mk" +BUILDLINK_DEPMETHOD.libXrandr?= build +.include "../../x11/libXrandr/buildlink3.mk" .include "../../mk/java-env.mk" .include "../../mk/bsd.pkg.mk" diff --git a/openjdk11/PLIST b/openjdk11/PLIST index ecb3ee6e..d9b71560 100644 --- a/openjdk11/PLIST +++ b/openjdk11/PLIST @@ -284,10 +284,6 @@ java/${JAVA_NAME}/legal/java.desktop/ADDITIONAL_LICENSE_INFO java/${JAVA_NAME}/legal/java.desktop/ASSEMBLY_EXCEPTION java/${JAVA_NAME}/legal/java.desktop/LICENSE java/${JAVA_NAME}/legal/java.desktop/colorimaging.md -java/${JAVA_NAME}/legal/java.desktop/giflib.md -java/${JAVA_NAME}/legal/java.desktop/harfbuzz.md -java/${JAVA_NAME}/legal/java.desktop/lcms.md -java/${JAVA_NAME}/legal/java.desktop/libpng.md java/${JAVA_NAME}/legal/java.desktop/mesa3d.md java/${JAVA_NAME}/legal/java.desktop/xwd.md java/${JAVA_NAME}/legal/java.instrument/ADDITIONAL_LICENSE_INFO diff --git a/openjdk11/distinfo b/openjdk11/distinfo index 456c7caa..526245b0 100644 --- a/openjdk11/distinfo +++ b/openjdk11/distinfo @@ -1,9 +1,9 @@ $NetBSD: distinfo,v 1.65 2018/12/15 20:27:45 jperkin Exp $ -SHA1 (openjdk11/4397fa4529b2.tar.bz2) = a9280a90feeb3572048ef9cb4b29e14760bef8da -RMD160 (openjdk11/4397fa4529b2.tar.bz2) = 8f2963342133df13802e09aa0796ffa1fbcf0612 -SHA512 (openjdk11/4397fa4529b2.tar.bz2) = 4002255f3544d12a074a1c831b71124f8352235bb65ab3b25456ac4e1d13d797a36e353b07cbd5d255283b93a7f0c43e3dd2a4d31617af09613266b268d86c77 -Size (openjdk11/4397fa4529b2.tar.bz2) = 91516849 bytes +SHA1 (openjdk11/8b3498547395.tar.bz2) = 559ea3b4e97944d07b51a3cb89de7f216267778c +RMD160 (openjdk11/8b3498547395.tar.bz2) = cc2e0d939909529e1f8df0247314b7bee7caa900 +SHA512 (openjdk11/8b3498547395.tar.bz2) = 32e6d8f356224ad9f9221d8f0deb19468b03e8ca0f03cbf951b7f26e09c9c8d0fb2ba2c81c2bcc5564facd3a89bb93b1972426fc5c11e880ae9728680d295853 +Size (openjdk11/8b3498547395.tar.bz2) = 95156715 bytes SHA1 (openjdk11/openjdk10-10.0.46-x86_64-sun-solaris.tar.gz) = f0f2d95bd7ced602d58fb2d9bbaf9d925c9d5b16 RMD160 (openjdk11/openjdk10-10.0.46-x86_64-sun-solaris.tar.gz) = d1287f91f402e02792e7b4721c16c08a5ca58865 SHA512 (openjdk11/openjdk10-10.0.46-x86_64-sun-solaris.tar.gz) = 51bce5bd1a1af95efe995dfb22cca748c37e63d9a556cb2b21089c1a36b26d79159921eefcb9124c2276c19661f8aa4ad8736bb3a730c006d3cd0da34b67f73e @@ -11,14 +11,14 @@ Size (openjdk11/openjdk10-10.0.46-x86_64-sun-solaris.tar.gz) = 217572684 bytes SHA1 (patch-make_GenerateLinkOptData.gmk) = 1d2bc7f9b4a6c9ba12de18661c7c8025bff14168 SHA1 (patch-make_autoconf_basics.m4) = ee458e62ee70e8143631320a8080e279430ae9cb SHA1 (patch-make_autoconf_flags-cflags.m4) = d6499ab75284e5554f02f9217c9bb159b905f8dd -SHA1 (patch-make_autoconf_flags-ldflags.m4) = cf1eee57bb8a07af9fd2f33e9e181f5eb2d60081 +SHA1 (patch-make_autoconf_flags-ldflags.m4) = 65db7454a5bb0eb028495208c51b200df8a68f09 SHA1 (patch-make_autoconf_flags-other.m4) = 12f0447d871d97f49110b7d19bd792799d20919d SHA1 (patch-make_autoconf_hotspot.m4) = 64e54066c50a9b422a67a6c8f3e095aa5db36157 SHA1 (patch-make_autoconf_jdk-options.m4) = 16e9d2091235239285e45d9b207306114e286d0a SHA1 (patch-make_autoconf_lib-bundled.m4) = 30b2fd080b7b7f31c84276fb3e321bb1ae1bcbcd SHA1 (patch-make_autoconf_lib-x11.m4) = a0794b6a87668557f2f813d67355fdaf04a54b22 -SHA1 (patch-make_autoconf_libraries.m4) = 4dc6da66a238f6752f48d6f7f81199d6e19a4125 -SHA1 (patch-make_autoconf_spec.gmk.in) = 39aafe412b12e1e2620335f0234a307859195182 +SHA1 (patch-make_autoconf_libraries.m4) = 706fdc0b0cd5a2bdebe4884119136d063b6e7672 +SHA1 (patch-make_autoconf_spec.gmk.in) = 87264e1a663571271493899ba9d63c5db981255e SHA1 (patch-make_autoconf_toolchain.m4) = 364c80ba2ffa3bb6deed38dc21fe3c4b75e4a0a3 SHA1 (patch-make_hotspot_gensrc_GensrcAdlc.gmk) = 00fd3df8877fa3dc6551be7530b4163c7a1aeda2 SHA1 (patch-make_hotspot_gensrc_GensrcDtrace.gmk) = 84950cf7150af751fd5c2f45c6612a6e9f7fd0db @@ -26,20 +26,25 @@ SHA1 (patch-make_hotspot_lib_CompileJvm.gmk) = 11ab1dbe88bf9da4c0bad8d72166c682f SHA1 (patch-make_hotspot_lib_JvmOverrideFiles.gmk) = b3e05df4ea4a2055afdcf5f79e29ba79d08f8af6 SHA1 (patch-make_launcher_Launcher-jdk.pack.gmk) = acdd6002a2249c4ae95eef1c656b5ebce2cbcf4d SHA1 (patch-make_launcher_LauncherCommon.gmk) = 268aa85b24b4fdec713d7c75ce5e1fad86f96d64 -SHA1 (patch-make_lib_Awt2dLibraries.gmk) = db9065a57ee78f30968dad69a689016b5ee00ed7 +SHA1 (patch-make_lib_Awt2dLibraries.gmk) = b1ba76da864227a8fc88b0384b4e30a36f824ea7 SHA1 (patch-make_lib_Lib-java.instrument.gmk) = 8fbd2bf575c85c28d2afcb553ea007b8870b65d9 SHA1 (patch-make_lib_Lib-jdk.crypto.ec.gmk) = eabdb39d13bbb2eeafa8bc4adf31fad11f4e311a SHA1 (patch-make_lib_Lib-jdk.crypto.ucrypto.gmk) = dbdfa5b56b22ea13b3bf26e479ac3bfd9fdc2fec +SHA1 (patch-make_lib_Lib-jdk.hotspot.agent.gmk) = 6786109eec08cf91114cfa3b4644fcbc80ee6c51 SHA1 (patch-make_lib_Lib-jdk.jdwp.agent.gmk) = 9bf477a8ebaec0ef82abc46f0b109eda3e0d2c8d SHA1 (patch-make_lib_LibCommon.gmk) = 91c48cae5cff3d6e09ace5edf792a25161d827d0 +SHA1 (patch-src_hotspot_cpu_x86_vm__version__x86.cpp) = cf534429b056254174f61c87dd406f83f24c6834 SHA1 (patch-src_hotspot_os__cpu_solaris__x86_atomic__solaris__x86.hpp) = e88cdf2a3b8b1a050d365f099be6a35ca005f886 SHA1 (patch-src_hotspot_os__cpu_solaris__x86_bytes__solaris__x86.inline.hpp) = 7c7cb51d07943c20a9f72676b870b36cb838ccef SHA1 (patch-src_hotspot_os__cpu_solaris__x86_os__solaris__x86.cpp) = bd2c26f07bd70b685ea824941746111253064295 SHA1 (patch-src_hotspot_os__cpu_solaris__x86_os__solaris__x86.inline.hpp) = f3c823183c6832418ae6280952c7bd0ead8bb6b7 SHA1 (patch-src_hotspot_os__cpu_solaris__x86_prefetch__solaris__x86.inline.hpp) = 89677ace9756c77dc3c61b75857ae745e7630b0b +SHA1 (patch-src_hotspot_os_solaris_decoder__solaris.cpp) = 88f3882a707fe0aedd2949eda7111c5f728ab077 SHA1 (patch-src_hotspot_os_solaris_os__solaris.cpp) = 5a73b6326d17d7e1a56927c3d0ad443bd5f29532 SHA1 (patch-src_hotspot_share_gc_g1_g1Analytics.cpp) = a3a74ef9ff00a03a286220f620d458bcb532583d +SHA1 (patch-src_hotspot_share_runtime_os.cpp) = faa48ebc669df357acf28461264870e9e670e311 SHA1 (patch-src_hotspot_share_utilities_globalDefinitions__gcc.hpp) = 613148b09478c53555edb4649eac5be8aba669dc SHA1 (patch-src_java.base_solaris_native_libnio_ch_DevPollArrayWrapper.c) = 9e1ac188794814c03ebbdf5fab2f941afb86f265 SHA1 (patch-src_java.desktop_share_native_libsplashscreen_libpng_pngpriv.h) = dc0ff5118b26a397a001a6aaf58ae03fd1f4fa1f SHA1 (patch-src_jdk.crypto.ec_share_native_libsunec_ECC__JNI.cpp) = 149b99cd58ef8a2ef7b0401021d226dc03939739 +SHA1 (patch-src_jdk.hotspot.agent_solaris_native_libsaproc_saproc.cpp) = 943532baf689667205542d7ceb6787d41d3d740c diff --git a/openjdk11/options.mk b/openjdk11/options.mk deleted file mode 100644 index 38fa5bc3..00000000 --- a/openjdk11/options.mk +++ /dev/null @@ -1,48 +0,0 @@ -# $NetBSD$ - -PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk11 -PKG_SUPPORTED_OPTIONS= jre-jce x11 -PKG_SUGGESTED_OPTIONS= jre-jce x11 - -.include "../../mk/bsd.options.mk" - -# Java(TM) Cryptography Extension (JCE) -.if !empty(PKG_OPTIONS:Mjre-jce) -CONFIGURE_ARGS+= --enable-unlimited-crypto -.else -CONFIGURE_ARGS+= --disable-unlimited-crypto -.endif - -# X11 or headless build -PLIST_VARS+= x11 -.if !empty(PKG_OPTIONS:Mx11) -PLIST.x11= yes -CONFIGURE_ARGS+= --with-x=yes -CONFIGURE_ARGS+= --x-includes=${X11BASE}/include -CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib -DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/libXi/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXt?= build -.include "../../x11/libXt/buildlink3.mk" -.include "../../x11/libXtst/buildlink3.mk" -.include "../../x11/libXrender/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXrandr?= build -.include "../../x11/libXrandr/buildlink3.mk" -.else -MAKE_ENV+= BUILD_HEADLESS_ONLY=true -CONFIGURE_ARGS+= --without-x -CONFIGURE_ARGS+= --disable-headful -# We apparently still need the Xlib headers to build headless. why? -BUILDLINK_DEPMETHOD.libX11?= build -.include "../../x11/libX11/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXt?= build -.include "../../x11/libXt/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXrender?=build -.include "../../x11/libXrender/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXrandr?= build -.include "../../x11/libXrandr/buildlink3.mk" -post-configure: remove-x11-classes -remove-x11-classes: - rm ${WRKSRC}/jdk/src/solaris/classes/sun/awt/X11/*.java -.endif diff --git a/openjdk11/patches/patch-make_autoconf_flags-ldflags.m4 b/openjdk11/patches/patch-make_autoconf_flags-ldflags.m4 index 195230fb..499ef6a6 100644 --- a/openjdk11/patches/patch-make_autoconf_flags-ldflags.m4 +++ b/openjdk11/patches/patch-make_autoconf_flags-ldflags.m4 @@ -2,7 +2,7 @@ $NetBSD$ Support SunOS/gcc. ---- make/autoconf/flags-ldflags.m4.orig 2020-07-07 16:55:29.000000000 +0000 +--- make/autoconf/flags-ldflags.m4.orig 2020-07-29 16:52:13.000000000 +0000 +++ make/autoconf/flags-ldflags.m4 @@ -72,9 +72,13 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER], fi @@ -17,7 +17,7 @@ Support SunOS/gcc. + fi # s390x : remove unused code+data in link step if test "x$OPENJDK_TARGET_CPU" = xs390x; then - BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--gc-sections -Wl,--print-gc-sections" + BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--gc-sections" @@ -141,12 +145,14 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER], # Setup LDFLAGS for linking executables diff --git a/openjdk11/patches/patch-make_autoconf_libraries.m4 b/openjdk11/patches/patch-make_autoconf_libraries.m4 index 01fdb574..2d11eb41 100644 --- a/openjdk11/patches/patch-make_autoconf_libraries.m4 +++ b/openjdk11/patches/patch-make_autoconf_libraries.m4 @@ -2,9 +2,18 @@ $NetBSD$ Support SunOS/gcc. ---- make/autoconf/libraries.m4.orig 2019-01-08 12:44:55.000000000 +0000 +--- make/autoconf/libraries.m4.orig 2020-07-29 16:52:13.000000000 +0000 +++ make/autoconf/libraries.m4 -@@ -146,6 +146,7 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], +@@ -136,7 +136,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi + + if test "x$OPENJDK_TARGET_OS" = xsolaris; then +- BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lsocket -lsched -ldoor -ldemangle -lnsl \ ++ BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lsocket -lsched -ldoor -lnsl \ + -lrt -lkstat" + BASIC_JVM_LIBS="$BASIC_JVM_LIBS $LIBCXX_JVM" + fi +@@ -204,6 +204,7 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], AC_DEFUN_ONCE([LIB_SETUP_SOLARIS_STLPORT], [ if test "$OPENJDK_TARGET_OS" = "solaris" && test "x$BUILD_GTEST" = "xtrue"; then @@ -12,7 +21,7 @@ Support SunOS/gcc. # Find the root of the Solaris Studio installation from the compiler path SOLARIS_STUDIO_DIR="$(dirname $CC)/.." STLPORT_LIB="$SOLARIS_STUDIO_DIR/lib/stlport4$OPENJDK_TARGET_CPU_ISADIR/libstlport.so.1" -@@ -162,6 +163,7 @@ AC_DEFUN_ONCE([LIB_SETUP_SOLARIS_STLPORT +@@ -220,6 +221,7 @@ AC_DEFUN_ONCE([LIB_SETUP_SOLARIS_STLPORT AC_MSG_ERROR([Failed to find libstlport.so.1, cannot build Hotspot gtests]) fi AC_SUBST(STLPORT_LIB) diff --git a/openjdk11/patches/patch-make_autoconf_spec.gmk.in b/openjdk11/patches/patch-make_autoconf_spec.gmk.in index 17afdd7c..ccaba2b7 100644 --- a/openjdk11/patches/patch-make_autoconf_spec.gmk.in +++ b/openjdk11/patches/patch-make_autoconf_spec.gmk.in @@ -2,9 +2,9 @@ $NetBSD$ Ensure support libraries can be found during build. ---- make/autoconf/spec.gmk.in.orig 2019-01-08 09:40:27.000000000 +0000 +--- make/autoconf/spec.gmk.in.orig 2020-07-29 16:52:13.000000000 +0000 +++ make/autoconf/spec.gmk.in -@@ -466,12 +466,12 @@ LD:=@FIXPATH@ @LD@ +@@ -491,12 +491,12 @@ LD_JAOTC:=@LD_JAOTC@ SDKROOT:=@SDKROOT@ # LDFLAGS used to link the jdk native libraries (C-code) @@ -19,20 +19,20 @@ Ensure support libraries can be found during build. JDKEXE_LIBS:=@JDKEXE_LIBS@ # LDFLAGS specific to C++ linking. -@@ -590,9 +590,9 @@ JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_ +@@ -616,9 +616,9 @@ JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_ JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS) JAVAC=@FIXPATH@ $(JAVAC_CMD) JAVADOC=@FIXPATH@ $(JAVADOC_CMD) -JAR=@FIXPATH@ $(JAR_CMD) --JLINK = @FIXPATH@ $(JLINK_CMD) $(JAVA_TOOL_FLAGS_SMALL) +-JLINK = @FIXPATH@ $(JLINK_CMD) -JMOD = @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL) +JAR=LD_LIBRARY_PATH=$(BUILD_JDK)/lib:$(BUILD_JDK)/lib/jli:$(BUILD_JDK)/lib/server @FIXPATH@ $(JAR_CMD) -+JLINK = LD_LIBRARY_PATH=$(BUILD_JDK)/lib:$(BUILD_JDK)/lib/jli:$(BUILD_JDK)/lib/server @FIXPATH@ $(JLINK_CMD) $(JAVA_TOOL_FLAGS_SMALL) ++JLINK = LD_LIBRARY_PATH=$(BUILD_JDK)/lib:$(BUILD_JDK)/lib/jli:$(BUILD_JDK)/lib/server @FIXPATH@ $(JLINK_CMD) +JMOD = LD_LIBRARY_PATH=$(BUILD_JDK)/lib:$(BUILD_JDK)/lib/jli:$(BUILD_JDK)/lib/server @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL) JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD) # A specific java binary with specific options can be used to run # the long running background sjavac servers and other long running tasks. -@@ -605,8 +605,8 @@ JAVAC_FLAGS?=@JAVAC_FLAGS@ +@@ -631,8 +631,8 @@ JAVAC_FLAGS?=@JAVAC_FLAGS@ BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@ diff --git a/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk b/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk index 9c3e2b0d..293c7ba1 100644 --- a/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk +++ b/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk @@ -2,9 +2,9 @@ $NetBSD$ Support SunOS/gcc. XXX: retain solstudio support. ---- make/lib/Awt2dLibraries.gmk.orig 2019-01-08 09:40:28.000000000 +0000 +--- make/lib/Awt2dLibraries.gmk.orig 2020-07-29 16:52:13.000000000 +0000 +++ make/lib/Awt2dLibraries.gmk -@@ -377,7 +377,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB +@@ -384,7 +384,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB OPTIMIZATION := HIGHEST, \ CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ $(LCMS_CFLAGS), \ @@ -12,19 +12,19 @@ Support SunOS/gcc. XXX: retain solstudio support. CFLAGS_windows := -DCMS_IS_WINDOWS_, \ EXTRA_HEADER_DIRS := \ common/awt/debug \ -@@ -539,7 +538,11 @@ ifneq (, $(findstring $(OPENJDK_TARGET_O - HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES - endif - ifeq ($(OPENJDK_TARGET_OS), solaris) -+ ifeq ($(TOOLCHAIN_TYPE), gcc) -+ HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES -+ else - HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS -+ endif - endif - ifeq ($(OPENJDK_TARGET_OS), macosx) - HARFBUZZ_CFLAGS += -DHAVE_CORETEXT -@@ -857,6 +860,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false) +@@ -566,7 +565,11 @@ else + HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES + endif + ifeq ($(OPENJDK_TARGET_OS), solaris) ++ ifeq ($(TOOLCHAIN_TYPE), gcc) ++ HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES ++ else + HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS ++ endif + endif + ifeq ($(OPENJDK_TARGET_OS), macosx) + HARFBUZZ_CFLAGS += -DHAVE_CORETEXT +@@ -939,6 +942,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false) LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ_LIBS) \ $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \ LIBS_aix := -liconv, \ diff --git a/openjdk11/patches/patch-make_lib_Lib-jdk.hotspot.agent.gmk b/openjdk11/patches/patch-make_lib_Lib-jdk.hotspot.agent.gmk new file mode 100644 index 00000000..231efe97 --- /dev/null +++ b/openjdk11/patches/patch-make_lib_Lib-jdk.hotspot.agent.gmk @@ -0,0 +1,15 @@ +$NetBSD$ + +Switch to GCC demangler, from Tribblix. + +--- make/lib/Lib-jdk.hotspot.agent.gmk.orig 2020-07-29 16:52:13.000000000 +0000 ++++ make/lib/Lib-jdk.hotspot.agent.gmk +@@ -66,7 +66,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB + EXTRA_SRC := $(LIBSA_EXTRA_SRC), \ + LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \ + LIBS_linux := -lthread_db $(LIBDL), \ +- LIBS_solaris := -ldl -ldemangle -lthread -lproc, \ ++ LIBS_solaris := -ldl -lstdc++ -lthread -lproc, \ + LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \ + -framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \ + LIBS_windows := dbgeng.lib, \ diff --git a/openjdk11/patches/patch-src_hotspot_cpu_x86_vm__version__x86.cpp b/openjdk11/patches/patch-src_hotspot_cpu_x86_vm__version__x86.cpp new file mode 100644 index 00000000..8e7afe78 --- /dev/null +++ b/openjdk11/patches/patch-src_hotspot_cpu_x86_vm__version__x86.cpp @@ -0,0 +1,20 @@ +$NetBSD$ + +SunOS does not support cpu_microcode_revision(). + +--- src/hotspot/cpu/x86/vm_version_x86.cpp.orig 2020-07-29 16:52:13.000000000 +0000 ++++ src/hotspot/cpu/x86/vm_version_x86.cpp +@@ -750,7 +750,12 @@ void VM_Version::get_processor_features( + "(%u cores per cpu, %u threads per core) family %d model %d stepping %d microcode 0x%x" + "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", + cores_per_cpu(), threads_per_core(), +- cpu_family(), _model, _stepping, os::cpu_microcode_revision(), ++ cpu_family(), _model, _stepping, ++#ifdef __sun ++ "", ++#else ++ os::cpu_microcode_revision(), ++#endif + (supports_cmov() ? ", cmov" : ""), + (supports_cmpxchg8() ? ", cx8" : ""), + (supports_fxsr() ? ", fxsr" : ""), diff --git a/openjdk11/patches/patch-src_hotspot_os_solaris_decoder__solaris.cpp b/openjdk11/patches/patch-src_hotspot_os_solaris_decoder__solaris.cpp new file mode 100644 index 00000000..55b7b0e8 --- /dev/null +++ b/openjdk11/patches/patch-src_hotspot_os_solaris_decoder__solaris.cpp @@ -0,0 +1,30 @@ +$NetBSD$ + +Switch to GCC demangler, from Tribblix. + +--- src/hotspot/os/solaris/decoder_solaris.cpp.orig 2020-07-29 16:52:13.000000000 +0000 ++++ src/hotspot/os/solaris/decoder_solaris.cpp +@@ -24,9 +24,21 @@ + + #include "utilities/decoder_elf.hpp" + +-#include ++#include + + bool ElfDecoder::demangle(const char* symbol, char *buf, int buflen) { +- return !cplus_demangle(symbol, buf, (size_t)buflen); ++ int status; ++ char* result; ++ size_t size = (size_t)buflen; ++ // Don't pass buf to __cxa_demangle. In case of the 'buf' is too small, ++ // __cxa_demangle will call system "realloc" for additional memory, which ++ // may use different malloc/realloc mechanism that allocates 'buf'. ++ if ((result = abi::__cxa_demangle(symbol, NULL, NULL, &status)) != NULL) { ++ jio_snprintf(buf, buflen, "%s", result); ++ // call c library's free ++ ::free(result); ++ return true; ++ } ++ return false; + } + diff --git a/openjdk11/patches/patch-src_hotspot_share_runtime_os.cpp b/openjdk11/patches/patch-src_hotspot_share_runtime_os.cpp new file mode 100644 index 00000000..7e4173c9 --- /dev/null +++ b/openjdk11/patches/patch-src_hotspot_share_runtime_os.cpp @@ -0,0 +1,15 @@ +$NetBSD$ + +SunOS does not support tm_gmtoff. + +--- src/hotspot/share/runtime/os.cpp.orig 2020-07-29 16:52:13.000000000 +0000 ++++ src/hotspot/share/runtime/os.cpp +@@ -154,7 +154,7 @@ char* os::iso8601_time(char* buffer, siz + // No offset when dealing with UTC + time_t UTC_to_local = 0; + if (!utc) { +-#if defined(_ALLBSD_SOURCE) || defined(_GNU_SOURCE) ++#if (defined(_ALLBSD_SOURCE) || defined(_GNU_SOURCE)) && !defined(__sun) + UTC_to_local = -(time_struct.tm_gmtoff); + #elif defined(_WINDOWS) + long zone; diff --git a/openjdk11/patches/patch-src_jdk.hotspot.agent_solaris_native_libsaproc_saproc.cpp b/openjdk11/patches/patch-src_jdk.hotspot.agent_solaris_native_libsaproc_saproc.cpp new file mode 100644 index 00000000..639ab08f --- /dev/null +++ b/openjdk11/patches/patch-src_jdk.hotspot.agent_solaris_native_libsaproc_saproc.cpp @@ -0,0 +1,30 @@ +$NetBSD$ + +Switch to GCC demangler, from Tribblix. + +--- src/jdk.hotspot.agent/solaris/native/libsaproc/saproc.cpp.orig 2020-07-29 16:52:13.000000000 +0000 ++++ src/jdk.hotspot.agent/solaris/native/libsaproc/saproc.cpp +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -1221,8 +1221,13 @@ JNIEXPORT jstring JNICALL Java_sun_jvm_h + CHECK_EXCEPTION_(NULL); + char buf[2*SYMBOL_BUF_SIZE + 1]; + jstring res = 0; +- if (cplus_demangle((char*) ptr, buf, sizeof(buf)) != DEMANGLE_ESPACE) { ++ int status; ++ char* result; ++ if ((result = abi::__cxa_demangle(ptr, NULL, NULL, &status)) != NULL) { ++ snprintf(buf, 2*SYMBOL_BUF_SIZE+1, "%s", result); + res = env->NewStringUTF(buf); ++ // call c library's free ++ ::free(result); + } else { + res = name; + }