From nobody Mon Sep 11 03:23:28 2023 X-Original-To: dev-commits-ports-all@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 4RkX9Y2GtHz4tKlM; Mon, 11 Sep 2023 03:23:29 +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 4RkX9Y1nVGz4Jw1; Mon, 11 Sep 2023 03:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694402609; 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=+DdwwoNYi04eeSMHBr74xY5agdAVJCo3tA00imqvdlU=; b=yncElJdy/g8Vfp6XyLpqs2t7mC7PR24cy/o307s0r/mtD6IOguz8ihb1m4esZYnPVecHXg DSHHhjx64NIxrabt7YdgS6f+40lqKTsBTJiBZi7nbQchOJ3ensfEZ35KtG0kFkf7lixY1C tuDI3rYeLe6NWIADNbA7sfsVjPt/4BNuhQs5b8z9wPQTHnKbpFm9I4AZOS/ZlNuHwteSUI NAO9cqX6/xLXKV3K2aQ260CAXR5XcrrrDnQzslS8nYdtehBfjT9iJOTccjc4oJ7uphK4F+ E1iWGQQtMBSFBoZ1aDufxoSdCSQ71FMmBM+7J53/CoJav+sleWG3KieLQJ7QSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694402609; a=rsa-sha256; cv=none; b=vSfqVW8aff285/Wyhte+0ZN3l6oeLivw+KGHshWXRdc/+30f7Ezj3N0pp/n+sHUeCjZnF0 jYjxrLF+Im2IfZLK//kfqsHoN92p6dzzZa7tsguFWIBH5ZmtUTTl1dmsXVWuIKcaAvKW7I sgGtCJ4aEpwKX2iw+w75UTXf7XVpjWBPJxOaSrhz4AnK/B4eZ3aMu4MonBrmkVTLbmJ1Dp uOT3hilk/rEOBYskPkLrPn7yUAYS28i31rtFMtsoWkicM1w1TH1E8siLftAecDz8X6gE7P tuAqwslt2qpFMBNDos98r071RbxlHbNFWIGzW6Z8grBogKATxuDfBwAjFUTHRg== 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=1694402609; 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=+DdwwoNYi04eeSMHBr74xY5agdAVJCo3tA00imqvdlU=; b=i4IPjugPobi5bDKghQijst9ahwY/65UCiD0NI5i1dti6TSNVXrbYkOmpwLqS9/4wFIPg6z xA9e/jgWROm9IHHkckngPxeA7rYTwE/Oxwyhyo0ps3V9huD4VFJJhTDXd75UDSbdSVHvOs hDUDfQ6fcGSYMzhLwajNXE5BROITERUAAhqLMDbW4/LNOvFWXdQMGfGuzMOHH3+S3TFPa4 l6Vj3YgayHHZG2wBGWykOgacFCEUs5EPnq0hyKLJEqGktH5rTu+LZrMLOkmeVeYkuN2MtU 1KxmYta9Ct2Ppdoo1P0tuvkrC086bbgnTZPej/vEMz6f0bgDC1dwGpd4TQ8BHQ== 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 4RkX9Y0ffwzYkT; Mon, 11 Sep 2023 03:23:29 +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 38B3NSZs043567; Mon, 11 Sep 2023 03:23:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B3NSvV043564; Mon, 11 Sep 2023 03:23:28 GMT (envelope-from git) Date: Mon, 11 Sep 2023 03:23:28 GMT Message-Id: <202309110323.38B3NSvV043564@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: a0cd8fe305e3 - main - textproc/kibana7: Fix build with abseil 20230125.0+ and re2 20230601+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: a0cd8fe305e3c128e4de1ab570b29ac3f49e2cc6 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0cd8fe305e3c128e4de1ab570b29ac3f49e2cc6 commit a0cd8fe305e3c128e4de1ab570b29ac3f49e2cc6 Author: Po-Chuan Hsieh AuthorDate: 2023-09-11 03:18:38 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-11 03:22:48 +0000 textproc/kibana7: Fix build with abseil 20230125.0+ and re2 20230601+ --- textproc/kibana7/Makefile | 5 ++-- textproc/kibana7/files/patch-abseil | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/textproc/kibana7/Makefile b/textproc/kibana7/Makefile index ff8e25d75561..70e03c3bb3d0 100644 --- a/textproc/kibana7/Makefile +++ b/textproc/kibana7/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} WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} @@ -57,7 +58,7 @@ post-patch: ${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete cd ${_RE2DIR} && ${PATCH} -p0 < ${_RE2PATCHES} ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp \ + -e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp pre-configure: ( \ diff --git a/textproc/kibana7/files/patch-abseil b/textproc/kibana7/files/patch-abseil new file mode 100644 index 000000000000..e85f151b88cd --- /dev/null +++ b/textproc/kibana7/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:36:50.297531000 +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:35:52.639876000 +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; + }