git: d8c6c0053fd1 - main - textproc/kibana8: Fix build with abseil 20230125.0+ and re2 20230601+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 11 Sep 2023 03:23:30 UTC
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8c6c0053fd1e9b40e7fc1a0616bcdec960e6906 commit d8c6c0053fd1e9b40e7fc1a0616bcdec960e6906 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-09-11 03:18:40 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-09-11 03:22:48 +0000 textproc/kibana8: Fix build with abseil 20230125.0+ and re2 20230601+ --- textproc/kibana8/Makefile | 3 ++- textproc/kibana8/files/patch-abseil | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/textproc/kibana8/Makefile b/textproc/kibana8/Makefile index 09ce1dbc2518..d284d2e4e6dc 100644 --- a/textproc/kibana8/Makefile +++ b/textproc/kibana8/Makefile @@ -18,13 +18,14 @@ LIB_DEPENDS= libre2.so:devel/re2 \ libuv.so:devel/libuv RUN_DEPENDS= ${LOCALBASE}/bin/node:www/node16 -USES= compiler:c++14-lang cpe nodejs:16,build,run python:build +USES= compiler:c++17-lang cpe nodejs:16,build,run python:build CPE_VENDOR= elastic USE_GITHUB= nodefault GH_TUPLE= nodejs:nan:v${_NODE_NAN_VER}:node_nan \ uhop:node-re2:${_NODE_RE2_VER}:node_re2 +USE_CXXSTD= c++17 USE_RC_SUBR= ${PORTNAME} CONFLICTS= kibana7 diff --git a/textproc/kibana8/files/patch-abseil b/textproc/kibana8/files/patch-abseil new file mode 100644 index 000000000000..535d37e23b0c --- /dev/null +++ b/textproc/kibana8/files/patch-abseil @@ -0,0 +1,50 @@ +--- ../node-re2-1.19.1/binding.gyp.orig 2023-06-16 04:48:53.000000000 +0800 ++++ ../node-re2-1.19.1/binding.gyp 2023-09-10 23:30:27.001674000 +0800 +@@ -50,6 +50,9 @@ + "-O3", + "-g" + ], ++ "cflags_cc": [ ++ "-std=c++17", ++ ], + "defines": [ + "NDEBUG", + "NOMINMAX" +--- ../node-re2-1.19.1/lib/replace.cc.orig 2023-06-16 04:48:53.000000000 +0800 ++++ ../node-re2-1.19.1/lib/replace.cc 2023-09-10 21:25:51.818852000 +0800 +@@ -107,7 +107,7 @@ + i += 2; + continue; + case '&': +- result += groups[0].as_string(); ++ result += std::string(groups[0]); + i += 2; + continue; + case '`': +@@ -139,7 +139,7 @@ + index2 = index * 10 + (ch - '0'); + if (index2 && index2 < groups.size()) + { +- result += groups[index2].as_string(); ++ result += std::string(groups[index2]); + continue; + } + result += '$'; +@@ -152,7 +152,7 @@ + i += 2; + if (index && index < groups.size()) + { +- result += groups[index].as_string(); ++ result += std::string(groups[index]); + continue; + } + result += '$'; +@@ -170,7 +170,7 @@ + if (group != namedGroups.end()) + { + index = group->second; +- result += groups[index].as_string(); ++ result += std::string(groups[index]); + } + i = nameEnd + 1 - data; + }