diff options
author | rhialto <rhialto@pkgsrc.org> | 2020-01-05 13:01:55 +0000 |
---|---|---|
committer | rhialto <rhialto@pkgsrc.org> | 2020-01-05 13:01:55 +0000 |
commit | 087a7f3430ccd770674266a0d3548b9de0196e99 (patch) | |
tree | b701156d4e1b8813de1fe9b0ba28c496f293a050 /lang/openjdk11 | |
parent | 259fff31c73f0851ce45b646558d378b6478969a (diff) | |
download | pkgsrc-087a7f3430ccd770674266a0d3548b9de0196e99.tar.gz |
lang/openjdk11: add patch for harfbuzz with gcc-7.
See added patch file for the longer explanation; reported upstream via
https://github.com/harfbuzz/harfbuzz/issues/2084 .
Diffstat (limited to 'lang/openjdk11')
-rw-r--r-- | lang/openjdk11/Makefile | 3 | ||||
-rw-r--r-- | lang/openjdk11/distinfo | 3 | ||||
-rw-r--r-- | lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc | 34 |
3 files changed, 38 insertions, 2 deletions
diff --git a/lang/openjdk11/Makefile b/lang/openjdk11/Makefile index 4ef2e05d6d3..861f34b69fc 100644 --- a/lang/openjdk11/Makefile +++ b/lang/openjdk11/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2019/12/18 13:14:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.10 2020/01/05 13:01:55 rhialto Exp $ DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/} PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/} +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} GITHUB_PROJECT= openjdk-jdk11u diff --git a/lang/openjdk11/distinfo b/lang/openjdk11/distinfo index 30246b7e979..267b463ca6a 100644 --- a/lang/openjdk11/distinfo +++ b/lang/openjdk11/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2019/12/04 12:19:52 tnn Exp $ +$NetBSD: distinfo,v 1.6 2020/01/05 13:01:55 rhialto 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 @@ -37,4 +37,5 @@ SHA1 (patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c) = fbc0aa6 SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c) = 39c7afb3c36fa9557d2a660c4b4068b5684c552f SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h) = 121357cb76b4a96c06cc2bf670579e0b27f66fc1 SHA1 (patch-src_java.base_unix_native_libjsig_jsig.c) = 82e3a8bad9ca18478cad85ada8544712ff117459 +SHA1 (patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc) = 0a78e7e8db513ddc06a75f6e504f8ce6132b97ec SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b diff --git a/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc b/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc new file mode 100644 index 00000000000..8b921ac10f3 --- /dev/null +++ b/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc @@ -0,0 +1,34 @@ +$NetBSD: patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc,v 1.1 2020/01/05 13:01:55 rhialto Exp $ + +Completely remove _POSIX_C_SOURCE; with g++7 it causes errors about undeclared +symbols such as + +In file included from /usr/pkg/gcc7/include/c++/math.h:36:0, + from /pkg_comp/obj/pkgsrc/lang/openjdk11/default/openjdk-jdk11u-jdk-11.0.5-10-1/src/java.desktop/share/native/libfontmanager/harfbuzz/hb.hh:171, + from /pkg_comp/obj/pkgsrc/lang/openjdk11/default/openjdk-jdk11u-jdk-11.0.5-10-1/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc:40: +/usr/pkg/gcc7/include/c++/cmath:1084:11: error: '::acosh' has not been declared + using ::acosh; + ^~~~~ + +Very briefly: defining _POSIX_C_SOURCE only removes features, and therefore is +almost never the correct thing to do. + +Filed upstream report to harfbuzz to patch this the same way: +https://github.com/harfbuzz/harfbuzz/issues/2084 + + +--- src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc.orig 2019-10-16 18:31:09.000000000 +0000 ++++ src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc +@@ -30,12 +30,6 @@ + * http://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html + * https://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html + */ +-#ifndef _POSIX_C_SOURCE +-#pragma GCC diagnostic push +-#pragma GCC diagnostic ignored "-Wunused-macros" +-#define _POSIX_C_SOURCE 200809L +-#pragma GCC diagnostic pop +-#endif + + #include "hb.hh" + #include "hb-blob.hh" |