From nobody Thu Dec 14 17:03:41 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 4SrdwY4bNvz52l34; Thu, 14 Dec 2023 17:03:41 +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 4SrdwY41zNz3Zlf; Thu, 14 Dec 2023 17:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573421; 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=hJ4kMb9ylbnn/bmgjRJBzMWmlJ7J/6PrjI8RRq7vXBc=; b=lX1BWa4dF1cRH7rZpdrfQJNeIjA+QW1saq1L7eCMlQsgvohSOML8hnnhDrd+XE0aYe5Evd IOP76M3aiBBGsCqigsSpSFfvHARbF4oOOwInfdoqwHhAliKG4j4dLwCpiF/K74gjHw2CCr xGQetDK5rHwiYU83+pqRLDrvgQPaLKidesIptr7k6HHBGc1wz9TmuDyc2ZBHVKD5axhJ7w cjoqh5i6fxFuYklVwHuDgGlbiHsZxRf+KsIhLnmkt7H2fUOwa+ua5H+bxjvh9ZlgWYM0bm MQ9TL1BKnFtIEifjqmZD/WWWAuXD+NOsKAzMT0sIc5ovQD8Itl4mXlWfWxlxVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573421; a=rsa-sha256; cv=none; b=qzz4vOEt/WIhZEYfQhugnzREVacGN6NpfyDhBsh+4G/6RD3ZbMT/QvAXcjKfqu5NZXZ+Ir AeN6N7m/KhIUoT0maE2oGGr7je2Y/5BLjofEVqPuXN59oFPzcw3qjYZWEg8L8MFBzthyV1 NFSvCYLekyFmji9SZTMBxQVYZClGeUNERJzAgm4UDxiLAnC3YCbqdcw8xbErn4HlwUakoL b7IcVKnh7geBf3VypEA0NmLbZsrB5aeIKimg82sNOq+ateUxq/Gm3H56Yog/CdnU4yD7O1 62wprrHi+QTOgfAtSHXSrkWG8ne4ybKTRGynELqOqRps4dOe48bWyVBqrATZtg== 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=1702573421; 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=hJ4kMb9ylbnn/bmgjRJBzMWmlJ7J/6PrjI8RRq7vXBc=; b=Z8LDr7BJr7aTEiAA5DokhHVUMJKK8CssJc2bl7bnUr663zfHcCFN91XhIEQRPQs5xVqUVA 8KfASz6u5uAlgJ2SAHcQUKCwwCRiMwyLkTYmbLJjrxaie4RDHAGpLO8GxjgvQsrWzdU7R3 cuVqOCus6X+GzaUDZN3yv8O6PN67+JMgatyRqn3w7aOt9zNc1w5W/GdUf/8u4CDFcD9rMC 2/OwL6UkPPB2hBk5uQyxUbLcgT7GPq7xZfI9lwjLPtstMPLGF480OjNj+O9MU9NxFm3ot9 ahbEaesqDzhL7l3AGM4qv4GK9faI4Phaj90mePqOKL8BrAJ9onCPjvyg0QfJZw== 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 4SrdwY36LyzbkW; Thu, 14 Dec 2023 17:03:41 +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 3BEH3ft6017298; Thu, 14 Dec 2023 17:03:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3fcC017295; Thu, 14 Dec 2023 17:03:41 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:41 GMT Message-Id: <202312141703.3BEH3fcC017295@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: 19998317be41 - main - misc/py-onnx: 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: 19998317be411820e5d183725a39bead3480de7f Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=19998317be411820e5d183725a39bead3480de7f commit 19998317be411820e5d183725a39bead3480de7f Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:46 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:07 +0000 misc/py-onnx: Fix build with protobuf 22+ --- misc/py-onnx/Makefile | 2 +- misc/py-onnx/files/patch-CMakeLists.txt | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/misc/py-onnx/Makefile b/misc/py-onnx/Makefile index ef62aca59178..2ca2a40f231a 100644 --- a/misc/py-onnx/Makefile +++ b/misc/py-onnx/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.2.1:devel/py-typing-extensions@${PY_FLAVOR} -USES= compiler:c11 python shebangfix +USES= compiler:c++17-lang python shebangfix USE_PYTHON= distutils concurrent autoplist CXXFLAGS+= -Dstat64=stat diff --git a/misc/py-onnx/files/patch-CMakeLists.txt b/misc/py-onnx/files/patch-CMakeLists.txt index 57ed278e4e2f..07e389904c09 100644 --- a/misc/py-onnx/files/patch-CMakeLists.txt +++ b/misc/py-onnx/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2023-04-12 23:29:41 UTC +--- CMakeLists.txt.orig 2023-08-08 18:33:06 UTC +++ CMakeLists.txt @@ -18,7 +18,7 @@ project(onnx C CXX) option(ONNX_BUILD_BENCHMARKS "Build ONNX micro-benchmarks" OFF) @@ -9,3 +9,12 @@ option(ONNX_GEN_PB_TYPE_STUBS "Generate protobuf python type stubs" ON) option(ONNX_WERROR "Build with Werror" OFF) option(ONNX_COVERAGE "Build with coverage instrumentation" OFF) +@@ -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()