CVS commit: pkgsrc/lang/openjdk11

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Oct  3 16:57:20 UTC 2019

Modified Files:
        pkgsrc/lang/openjdk11: distinfo
Added Files:
        pkgsrc/lang/openjdk11/patches: patch-make_lib_Awt2dLibraries.gmk

Log Message:
openjdk11: build fix for -current


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk11/distinfo
diff -u pkgsrc/lang/openjdk11/distinfo:1.1 pkgsrc/lang/openjdk11/distinfo:1.2
--- pkgsrc/lang/openjdk11/distinfo:1.1  Tue Oct  1 12:36:34 2019
+++ pkgsrc/lang/openjdk11/distinfo      Thu Oct  3 16:57:20 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2019/10/01 12:36:34 tnn Exp $
+$NetBSD: distinfo,v 1.2 2019/10/03 16:57:20 tnn Exp $
 
 SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c
 RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8
@@ -20,6 +20,7 @@ SHA1 (patch-make_autoconf_lib-freetype.m
 SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f
 SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d
 SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07
+SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = ee20027e4323ebf63874cedd9e4549ebb702d335
 SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 93a7098cb13adf5d28b16c123a390e5e13d626bf
 SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2

Added files:

Index: pkgsrc/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk
diff -u /dev/null pkgsrc/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk:1.1
--- /dev/null   Thu Oct  3 16:57:20 2019
+++ pkgsrc/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk     Thu Oct  3 16:57:20 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-make_lib_Awt2dLibraries.gmk,v 1.1 2019/10/03 16:57:20 tnn Exp $
+
+bundled harfbuzz code needs to use -std=c++11 for static_assert().
+But we can't add it to USE_LANGUAGES because the rest of the JDK
+contains legacy code that requires -std=gnu++98.
+
+--- make/lib/Awt2dLibraries.gmk.orig   2019-09-19 12:22:38.000000000 +0000
++++ make/lib/Awt2dLibraries.gmk
+@@ -612,7 +612,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB
+         AccelGlyphCache.c, \
+     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
+     CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
+-    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
++    CXXFLAGS := $(CXXFLAGS_JDKLIB) -std=c++11 $(LIBFONTMANAGER_CFLAGS), \
+     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
+     CFLAGS_windows = -DCC_NOEX, \
+     EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \