From nobody Mon Sep 11 03:23:30 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkX9Z3yL5z4tKfj; Mon, 11 Sep 2023 03:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkX9Z3KW2z4K3D; Mon, 11 Sep 2023 03:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694402610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0fInPt5+agwMN4+oCYERR2GqM8w+Wql8UM0ajK0cez4=; b=vYGwpepTRWdi845YtQEruodggEHpUhGmPlwyuzh7icjt2rmBRTn03Qq0nx9LbDnMDa5ftI vTlibBNBlguXhtq4AjDWQpQnbjxhKl9xaN4zlS8NJBfdJHsV/5qnR3EHXdHa4aPv36tHnK eJQ6uAXaE6eTxjGbRbBVIAUgjL9JdmCVMLD+bYmdhibnviAgfhNoZr51iVkPfKy/Y/+J0O UlOCzVtvFVGdmZbMst+rmMRWrlBMQiVOJnZCMbRL5PjVRmhO9Z+EbTYCeXdU4IhzkhngN1 0E8Q3feVQS9+MWXTJzd2Q6fHzHz71bYuUoUiloc4p2CYHwS3bf4WF3kibZyivw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694402610; a=rsa-sha256; cv=none; b=CPetVyn/K/wY4xWmFeg7DPT6VuFi58iL+aRygXyHRNUKk2zm17cuq3Lq1l5cCuokK1ELXM WBQTSIkxKX5G9qdNS0qVyUwphv3xLzElfvDseTzsL76jp9gC3rBkqLsadVk6bkoG7pCim6 3ZgSv1USDk9aSUOcnE6e6OLCuc+qFm1HKC65VduPQ3cx73/yhxOLjYaaXTERS1zOypyrOX FdTygM1Veupv/otqexHZBEkvL5txlQrd3UQywZJ6NJR6iBIYx4QYZSfYroZsxO8/5U82UP 8hvvT8QA14ja+NOwMhTL85gHU6Gr/m03D2YPmtbxTyMUauoflSSpkCbzl+g+8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694402610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0fInPt5+agwMN4+oCYERR2GqM8w+Wql8UM0ajK0cez4=; b=BNYdVzCnmre2Yc57tnlNyTTJMJFVbWGPCbEPsfFCZySTLhpvEmnJdMWQao7p+c1qMXC0eC tybc0fPnQ4nb2gYHwHw3XrWqB7qDoKVp7ly3zhw+S5I7G6y+fbr+ou7z6S79PDUeQ2Ri/A ZSmsLyEv2xgFxBpQVEn2PI5lQRP/MeYPJI2xKWGPjpJbwz/qc+hFMp/qyX2OZfQomxBVF7 3+/S06tkK/0aim4+0I+mAnJuGDCTp0RdH51XX+NfcHQnfvK5WW2Hg5+Xhqd6XGR9RrMpDs zZroJbZZ415uD3vEAgnSyqL9pXbRvjA0EexSElfPlwrarrA6hVVmlGNQVKTq+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkX9Z1gK7zYkV; Mon, 11 Sep 2023 03:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B3NUuv043627; Mon, 11 Sep 2023 03:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B3NUOK043624; Mon, 11 Sep 2023 03:23:30 GMT (envelope-from git) Date: Mon, 11 Sep 2023 03:23:30 GMT Message-Id: <202309110323.38B3NUOK043624@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: d8c6c0053fd1 - main - textproc/kibana8: Fix build with abseil 20230125.0+ and re2 20230601+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8c6c0053fd1e9b40e7fc1a0616bcdec960e6906 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8c6c0053fd1e9b40e7fc1a0616bcdec960e6906 commit d8c6c0053fd1e9b40e7fc1a0616bcdec960e6906 Author: Po-Chuan Hsieh AuthorDate: 2023-09-11 03:18:40 +0000 Commit: Po-Chuan Hsieh 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; + }