From nobody Thu Dec 14 17:03:43 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 4Srdwc4vwpz52krg; Thu, 14 Dec 2023 17:03:44 +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 4Srdwb6K1fz3ZxZ; Thu, 14 Dec 2023 17:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573423; 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=5frooS5OxLPoRt2RzarHnWyZpwlBioM9qxg4kM+Frvk=; b=qtW8peU3dncoUw0HvajVP/vg9egyVDpVLlCGVjREpwun1nm8a+OYh5a9smywr7hPSU/ysv Fw/UWMdFetA0LSk7/1c2FrPGUjRe0qlPpgokwLduuqBLgEayFE0AbCvbM48PZWkdZxdBp3 FQnwqLH6JZkQepIbZgdO1uvol29E7jR3DqFfRkaAEtiq5FqriOTAV0ZBp+Nov5dKrvY1Ow iH1A9J97gjnui14aDvSHBF/d4Yc4HCy6ldQE6rZiMqRKZGZfWsMCE16VAwA5mC0JK59P9W ecj+hWOflTtCvSxZ748fqxyaFIuqH0vtxbt3GM+EdowtAQl+jmKWQSX8kgTBlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573423; a=rsa-sha256; cv=none; b=JYp/qjZ2/yC+wecZ1PQUsZsnKULjwFZm9Eab1a7jm8bPq43IEnZLuU8vqz25PAhrh9whNi uS0IEd50CbuC/Fs+TuP1aDY48ArgAI8Jl+7z+xlQ9+JkaIOd2+8sNz9NY8aGQ4WGGcraWU DiyMDw2hBMOUd8a5qfW7HzQEhjyWk2XTOPFxa3cCGjhZoQwFqGD+HoBHz3Xz10PGv5EPQx GO9DbWxk1p+UEbXjvKvJoyN4qVKrdrvUqpsVr4OJEk63kSzhNjaga5HcZLPdmpJ02wx+vN M6EuB5mEH90cVspzQKqJ4VJ3IYWVANTAANlpnP34ccpU5fLgt8u3tgYaxrmAdg== 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=1702573423; 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=5frooS5OxLPoRt2RzarHnWyZpwlBioM9qxg4kM+Frvk=; b=nlq+IS/UxjdBsOPQpv282RcSNT2BbZ3k3f2rgKraT3qzSROTp0ez68oH/GIpr3LUBWNiU7 +E7MYH81s6ZpLxcHI3g8Lszno+Valyb5E3Tt7tTae8tFBcR0nDiyjjajXuKGoKkV6586pb w0jzMdoAU/EzLJCPchKd2iSZHivvh1Bi+PP/rIyaWHpDFeeNCClvyA08uG01kiJz86jdie sg1cl1U8RQtAW/KxsLTrXAZgeElYSdzZGOAnE/Aa1jTSKdLbgB03ujxDSl9G5f3vusC9E1 YajV9jkB9nYd15BycO3RpMUiv2DN2Jc5NBoZ0qFYEahI3OpdHvMdUBTSV2yVtw== 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 4Srdwb5QrpzbkX; Thu, 14 Dec 2023 17:03:43 +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 3BEH3hnM017394; Thu, 14 Dec 2023 17:03:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3hkn017391; Thu, 14 Dec 2023 17:03:43 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:43 GMT Message-Id: <202312141703.3BEH3hkn017391@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: 16567d7044fd - main - net/ecal: 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: 16567d7044fd151e4aac9e8adc6edde0ee7540d9 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=16567d7044fd151e4aac9e8adc6edde0ee7540d9 commit 16567d7044fd151e4aac9e8adc6edde0ee7540d9 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:25:02 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:07 +0000 net/ecal: Fix build with protobuf 22+ --- net/ecal/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ecal/Makefile b/net/ecal/Makefile index 0c75e1a170e6..8e69c866d1e8 100644 --- a/net/ecal/Makefile +++ b/net/ecal/Makefile @@ -25,7 +25,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libyaml-cpp.so:devel/yaml-cpp # binaries aren't linked with libfineftp-server.so, see https://github.com/continental/ecal/issues/381; same with libcurl.so -USES= cmake desktop-file-utils localbase:ldflags qt:5 shared-mime-info +USES= cmake compiler:c++17-lang desktop-file-utils localbase:ldflags qt:5 shared-mime-info USE_QT= core gui widgets buildtools:build qmake:build USE_LDCONFIG= yes @@ -50,6 +50,8 @@ CMAKE_ARGS= -DGIT_REVISION_MAJOR=${DISTVERSION:R:R} \ -Dqwt_LIBRARY=${LOCALBASE}/lib/qt5/libqwt6.so CXXFLAGS+= -pthread # see https://github.com/eclipse-ecal/ecal/issues/933 +LDFLAGS+= -labsl_hash -labsl_log_internal_message -labsl_log_internal_nullguard -labsl_spinlock_wait +USE_CXXSTD= c++17 PLIST_SUB= VERSION=${DISTVERSION}