From nobody Thu Dec 14 17:03:40 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 4SrdwX5d9Fz52l45; Thu, 14 Dec 2023 17:03:40 +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 4SrdwX3382z3ZlK; Thu, 14 Dec 2023 17:03:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573420; 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=h4bb22HMAFY96mAEIHMEa+JEGrsXd7UU8DX6l2WMUjE=; b=uws6EQuubcu3IPIzTkOWFAIGHMVUw4yElopEUCwRmK3Z97BsdbOB9r9GNlPFBvIW7Emc/+ C7vOkDXdxrDAWyv+IUE0EGMd0Ls7bJ500wW2SEuz+tPDlvcNXrgYcZv9k/Qr8vyDwIqigB J0YD8Qoo4kGneXPBdO7Nc3ZvK5K39lIeLfjGvwEJt2XNOSQztyzMDq1zrGeGJ4qhLqJMnZ oL5cD5r/4GVIiUCL8Oaaooa8CA6TK18AARlcgZ4yKBdIqaJg+5LSk14xg3Eb6Y7bjAlCUy tHm0LNVx037uvqiV1L8TFMjgacyxjzl1tad5ngmfiuMZMULXqFzidH9wIvyDHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573420; a=rsa-sha256; cv=none; b=AgR+URkfzot3UuZZ9UWzb+Vd8ZAAS0VQ75Ri9/tAmE/oHQpFgjUd0HxL/BW1Gsnw07sPqr SFAwuHcVn+pDDiW9T7CtF6eI4HBfxZ9Q7qgmFpCTWNMcZQoz18yMbNGjSNMTapGohJlh+N OaasCaHKEhL+T+Pz4G+guOWqIh0x25jlsSkprXq4SvcIUuKmyFlAK1+J9R0PnP5K17LBDX ifiqy/ZC0z1u2y+QJixHsecy6QdPIlmHYGa+YdZcdJn3/I2lfGqNDWIyTwE8JBG3mBZPvF hPkgYBmJyqEHj7ZBKGiYx7WCYBNpPn1cryLZ25OFwxM/ma340vveD/nLta8WHA== 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=1702573420; 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=h4bb22HMAFY96mAEIHMEa+JEGrsXd7UU8DX6l2WMUjE=; b=CeM9bShopPFGXTVa1GP3TKHIhlt5rXfSEfDJjVWewP0d4nCWloBwydsFW7WQfGpB/HbhPy hX869sSPqW8b7c98W+hriIm0dKkiFLcOZ1n8JPAWMmoiLHaXMXkieqbCn9ZyV6fYclghmW Zrt5jRt0clJFMeNTmv4bfFmECSsS+GjKIe1LldL4bCeCitXJk1+KfmYlQufUZFOqOk/o42 eiPR7vudV9Uk269wHugjlxTtjgq+z9xKHhrM0osMe4T0rWvl4OFpxiz+i4Aclfw7vwI0rI HsYRZva5W61mDKJt1a9PXLbic55SqelcC8VZRzZdkBSyRp+QRxE2xmkRdR/keQ== 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 4SrdwX24RPzbmn; Thu, 14 Dec 2023 17:03:40 +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 3BEH3e8f017253; Thu, 14 Dec 2023 17:03:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3eNX017250; Thu, 14 Dec 2023 17:03:40 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:40 GMT Message-Id: <202312141703.3BEH3eNX017250@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: b4f7ce877308 - main - misc/onnx: Fix build with protobuf 22+ 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: b4f7ce8773083a30b43cb4ca30ca7c36af5ebc39 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4f7ce8773083a30b43cb4ca30ca7c36af5ebc39 commit b4f7ce8773083a30b43cb4ca30ca7c36af5ebc39 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:44 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:07 +0000 misc/onnx: Fix build with protobuf 22+ --- misc/onnx/Makefile | 2 +- misc/onnx/files/patch-CMakeLists.txt | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/misc/onnx/Makefile b/misc/onnx/Makefile index 6873cb6bb9e1..49191583bbe9 100644 --- a/misc/onnx/Makefile +++ b/misc/onnx/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE #BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libprotobuf.so:devel/protobuf -USES= cmake:testing compiler:c++11-lang python:build +USES= cmake:testing compiler:c++17-lang python:build USE_GITHUB= yes diff --git a/misc/onnx/files/patch-CMakeLists.txt b/misc/onnx/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..fafb0e60da96 --- /dev/null +++ b/misc/onnx/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2023-08-24 22:20:34 UTC ++++ CMakeLists.txt +@@ -58,7 +58,7 @@ endif() + # Required to use /std:c++17 or higher on Windows + # For other platforms, set C++11 as standard for the whole project + if(NOT MSVC) +- set(CMAKE_CXX_STANDARD 11) ++ set(CMAKE_CXX_STANDARD 17) + else() + string(APPEND CMAKE_CXX_FLAGS " /std:c++17") + endif()