sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-05 21:00:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

textproc/kibana8: Fix build with abseil 20230125.0+ and re2 20230601+

Browse source
This commit is contained in:
Po-Chuan Hsieh 2023-09-11 11:18:40 +08:00
parent a0cd8fe305
commit d8c6c0053f
No known key found for this signature in database
GPG key ID: 9A4BD10F002DD04B
2 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
textproc/kibana8/Makefile
View file

@ -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

50
textproc/kibana8/files/patch-abseil Normal file
View file

@ -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;
}