diff options
| author | tnn <tnn@pkgsrc.org> | 2019-10-03 16:57:20 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2019-10-03 16:57:20 +0000 |
| commit | 1034229541a3f7337925f7d54f45a8a5b799a649 (patch) | |
| tree | e825dc8db7c55238e5bd3dcc5faeecc8649c98df /lang/openjdk11 | |
| parent | 79c50b51c422c236c4291950fc4bc9f18d85e5dc (diff) | |
| download | pkgsrc-1034229541a3f7337925f7d54f45a8a5b799a649.tar.gz | |
openjdk11: build fix for -current
Diffstat (limited to 'lang/openjdk11')
| -rw-r--r-- | lang/openjdk11/distinfo | 3 | ||||
| -rw-r--r-- | lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/lang/openjdk11/distinfo b/lang/openjdk11/distinfo index 1de04fc9d64..879a1ca504a 100644 --- a/lang/openjdk11/distinfo +++ b/lang/openjdk11/distinfo @@ -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.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7 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 diff --git a/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk b/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk new file mode 100644 index 00000000000..318504c7626 --- /dev/null +++ b/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk @@ -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), \ |