From nobody Thu Dec 14 17:03:51 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 4Srdwl6QHVz52kh2; Thu, 14 Dec 2023 17:03:51 +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 4Srdwl5hTJz3bDc; Thu, 14 Dec 2023 17:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573431; 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=GPLiy5ZYBhsQMk00GrKkTDHESjgVnYgXCr4VXwWKq6o=; b=o1zfrO4E4N5u801sYNqE0A53UhmKBvzVxKjwv8vmjyLRt9nm1197ICYjDA1FYn0lfmXEO0 lMz42uoM0kWGWtN7/4N54wZ1idXAltaBKtMs9GhZj/6Yja34gExSBnHpeqw2xppkrKZxcG RgEyMyCnPQECTjQPd9pBb/45okHgcgetjqcL5aCpC0b67E057TdP3HyxICqmSKvMKz8iwT wCha65ILh/5zdwcY9cmFsWKyW/jW+p6ctOiPoxdctjse1axcRt23oNhmTb0KdxWDiKy9tR G8kkPZEqxrf/VesSbXI1PdlnoCDt93d1LKjcbhgGOrE4nP1IJYd0lrM2Ktw/fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573431; a=rsa-sha256; cv=none; b=cHFw0c9Tvo9OINXUFJem88DeiUpL6B+o/qbDFk60hHkBY//TpSWIugb1IloSDY6dUcaMl0 EvnK8odhpVqCbTyPENBuDXz2G/WVV7pYWUpoVKZrCwuhH14HS1nXIvDmxkRg805gkB/VHx AgGm2TKEPKLEfJ/gTium1XE2BZrjSXd9B68phMSw7zMdzMKezYnPW7qca51WQ62XTl+e4G f01aL0mgCcxewUmZU+Kqv5z+yf2Hrh2iwkAbOgKqJ997BFFnTvFi/6c7S/Lq8Po3HJY2Qm aSESrlmYwoXnfEP13Mt/V8HlsFmLEQDA/AY8pXGMoQ0MIZTZ+loEDaV9hY0hDg== 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=1702573431; 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=GPLiy5ZYBhsQMk00GrKkTDHESjgVnYgXCr4VXwWKq6o=; b=DiJHL6gpObGEbe+Z9bGf0Ra/zrf01RyexIsHPbqLbyDktJ938O7x6O1j2eG2A9YKcnrSXa lMNbZhWTzWzYbqRvrnMLbOAmIWcrPKOeeAIL0eHNH4w6apLj2ODlwTAvQ2lauNlo7F3tQ/ 9ViqAm4pLxiarkN+j9vjm/mh4W9gTmqu9oyO6u4tnTcVUNPIh9zfsTL+UgETGIH4iDDndy n8GbEW0KbdS4AzbPkNS/pH1zHwir9dIIRTsSD+DdsF1A2oZWdhO8t1YqT4dSKWWYV00Lmq aPAVQMF+UcDvNQLeZ/0wrsI2e6rBACvOFX67Qvtm3/EklCQ6KeDFZmh8PNsJlA== 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 4Srdwl4mtwzbWj; Thu, 14 Dec 2023 17:03:51 +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 3BEH3pUM017717; Thu, 14 Dec 2023 17:03:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3pan017714; Thu, 14 Dec 2023 17:03:51 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:51 GMT Message-Id: <202312141703.3BEH3pan017714@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: 5d2dcaa23934 - main - net-mgmt/netdata: Fix build with protobuf 22+ 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: 5d2dcaa23934d04c874044f02b6dcc065cab02f1 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d2dcaa23934d04c874044f02b6dcc065cab02f1 commit 5d2dcaa23934d04c874044f02b6dcc065cab02f1 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:23:16 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:09 +0000 net-mgmt/netdata: Fix build with protobuf 22+ --- net-mgmt/netdata/Makefile | 3 ++- net-mgmt/netdata/files/patch-configure.ac | 27 ++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile index 3faf3124ee17..578b4d825b85 100644 --- a/net-mgmt/netdata/Makefile +++ b/net-mgmt/netdata/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ bash:shells/bash \ curl:ftp/curl -USES= autoreconf cpe gmake localbase:ldflags pathfix \ +USES= autoreconf compiler:c++17-lang cpe gmake localbase:ldflags pathfix \ pkgconfig:both python shebangfix ssl USE_RC_SUBR= ${PORTNAME} SHEBANG_GLOB= * @@ -36,6 +36,7 @@ CONFIGURE_ARGS= --disable-h2o --disable-unit-tests --with-user=netdata INSTALL_TARGET= install-strip CPPFLAGS+= -D_WANT_VMMETER +USE_CXXSTD= c++17 SUB_FILES= ${PORTNAME}.conf.sample SUB_LIST= NETDATA_CACHE=${NETDATA_CACHE} \ diff --git a/net-mgmt/netdata/files/patch-configure.ac b/net-mgmt/netdata/files/patch-configure.ac index 4cba0240a7a7..280e765aba4e 100644 --- a/net-mgmt/netdata/files/patch-configure.ac +++ b/net-mgmt/netdata/files/patch-configure.ac @@ -1,5 +1,5 @@ ---- configure.ac.orig 2023-07-23 18:34:41.165387302 -0600 -+++ configure.ac 2023-07-23 18:42:45.117534306 -0600 +--- configure.ac.orig 2023-10-30 12:43:22 UTC ++++ configure.ac @@ -5,11 +5,11 @@ AC_PREREQ(2.60) @@ -16,9 +16,18 @@ AM_MAINTAINER_MODE([disable]) if test x"$USE_MAINTAINER_MODE" = xyes; then -@@ -1354,15 +1354,15 @@ +@@ -243,7 +243,7 @@ fi + # C++ version check + + # Check for C++17 support (optional) +-# AX_CXX_COMPILE_STDCXX(17, noext, optional) ++AX_CXX_COMPILE_STDCXX(17, noext, optional) + + if test "x$HAVE_CXX17" != "x1"; then + # Check for C++11 support (optional) +@@ -1416,15 +1416,15 @@ if test "${enable_ml}" = "yes" -a "${have_uuid}" != "y fi - + # Check if submodules have not been fetched. Fail if ML was explicitly requested. -AC_MSG_CHECKING([if git submodules are present for machine learning functionality]) -if test -f "ml/dlib/dlib/all/source.cpp"; then @@ -36,10 +45,10 @@ +# AC_MSG_RESULT([no]) +# have_ml_submodules="no" +# fi - + if test "${enable_ml}" = "yes" -a "${have_ml_submodules}" = "no"; then AC_MSG_ERROR([You have explicitly requested --enable-ml functionality but it cannot be built because the required git submodules are missing.]) -@@ -1382,8 +1382,8 @@ +@@ -1444,8 +1444,8 @@ fi AM_CONDITIONAL([ENABLE_ML], [test "${build_ml}" = "yes"]) if test "${build_ml}" = "yes"; then AC_DEFINE([ENABLE_ML], [1], [anomaly detection usability]) @@ -48,9 +57,9 @@ +# OPTIONAL_ML_CFLAGS="-DDLIB_NO_GUI_SUPPORT -I \$(abs_top_srcdir)/ml/dlib" +# OPTIONAL_ML_LIBS="" fi - - -@@ -1788,14 +1788,14 @@ + + +@@ -1850,14 +1850,14 @@ AC_SUBST([OPTIONAL_DL_LIBS]) AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])