From nobody Sun Oct 13 19:07:04 2024 X-Original-To: dev-commits-ports-branches@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 4XRVGc2bZpz5YNqM; Sun, 13 Oct 2024 19:07:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XRVGc1zZXz4PnW; Sun, 13 Oct 2024 19:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728846424; 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=4xm1u9boDJOps3qN5WAPDZ0O7iCyQRy+Y9sJYXmqsg0=; b=epJHj3Lc2xfm5GV0d5/n9u0aeKAIsP/eVkbqZG0bnWEgKbTKFOUb3+08dZ+y873+y3EBa3 dqaU4FtUH523MzrE8BVD2BDM29TYwEyPpGQB/c5o+Ay02vxnSLYkL4EeOC12WC3QjyPNvE ZbO5jbZ4s0iFihJKHUebbSX6db10PwgY07T0D7lBiNeJQtqzhLONqxV4LTC5uyt7lBEM8g XAKyXh7vN1JlfJySplGMdAhQk331JtYzwx1cLTKLXSUtoRYXoyw9Pt3YPN9SkbQFC6rVt4 9lLC4/j1ZnS+mDXGbp+wohKIACtW5vWYYIOXwuasm6NLE2Ko5WRCyYXkpZWmaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728846424; 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=4xm1u9boDJOps3qN5WAPDZ0O7iCyQRy+Y9sJYXmqsg0=; b=wnxuWZ0onQELoPuFzCTpvjtCavHcVx65LujNWozrqpcox1pc9HacjpWTzReaJ8e01vjrG/ KqoIIbDEO+3psw34oyNTYyAsdlTYhYDjIhs0al00+inr3kpkNntD9OQUfrSeHzeJPTccaC cd76czcHnZngjsF+WPICHZd4tUt1wH03GI+j8KtHrr8lbkK7qGNAZ4J1hL5A0zNGOfzkmv JQHk+mwUWl1m4M1GcSCsnioqEgHgCdbnEWQshH6yz+Ij1BUPZxYN95L+5PRb4fRc2ei6s0 +gtfWkMi82Bu6GnIOqtB5cV50jb24BDX2uY9aVbps46tYDBNQSHhGwBv5qQcEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728846424; a=rsa-sha256; cv=none; b=hG/JLnptDoFrFnN6oqHqpZDxy+0dY4LwRDzjaahJg6/VwmY6/cVh6ilCg1T58AcnGvTg1W +tIn0oIKP//4ReLB4rg2pyZ7udNCNYSqYC00F1YE0oPZPlgTCyn/jEJjAMq1BJ0Kqb6SyR sSBpKkg++eVkLQKwGAVCL0md31UAVLmG+KSaa/rCzcoasda06HXC24+rW//eAuf7yoNmwb ue2sC/GlKdqSUj4DRbT06loylI7PO9/kV7vLr2pe9gbu4jiS6CRc4qDLKVuh7AIQVH9tN8 2ke1cW0sogDUuYnTYOyorMa4XBaq7h24K5istnJUJ7uPuBmV5piRXYR2ibDmyg== 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 4XRVGc1bBcz15vq; Sun, 13 Oct 2024 19:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49DJ74xP090691; Sun, 13 Oct 2024 19:07:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DJ74NB090688; Sun, 13 Oct 2024 19:07:04 GMT (envelope-from git) Date: Sun, 13 Oct 2024 19:07:04 GMT Message-Id: <202410131907.49DJ74NB090688@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: c5df5c6227c1 - 2024Q4 - misc/onnxruntime: Remove BUILD_SHARED_LIBS; Add CONFLICTS_BUILD List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: c5df5c6227c1bda1057c909ed3fc9250f29bd4bf Auto-Submitted: auto-generated The branch 2024Q4 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5df5c6227c1bda1057c909ed3fc9250f29bd4bf commit c5df5c6227c1bda1057c909ed3fc9250f29bd4bf Author: Yuri Victorovich AuthorDate: 2024-10-09 00:08:56 +0000 Commit: Yuri Victorovich CommitDate: 2024-10-13 19:06:57 +0000 misc/onnxruntime: Remove BUILD_SHARED_LIBS; Add CONFLICTS_BUILD All tests except for one succeed now. (cherry picked from commit b3cce401eab1ceeb04a0c6fb78f15371c54a52bf) --- misc/onnxruntime/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/misc/onnxruntime/Makefile b/misc/onnxruntime/Makefile index b46bf44d1901..fe379ece94a9 100644 --- a/misc/onnxruntime/Makefile +++ b/misc/onnxruntime/Makefile @@ -1,6 +1,7 @@ PORTNAME= onnxruntime DISTVERSIONPREFIX= v DISTVERSION= 1.18.2 +PORTREVISION= 1 CATEGORIES= misc # machine-learning DIST_SUBDIR= ${PORTNAME} @@ -23,7 +24,6 @@ GH_TUPLE= emscripten-core:emsdk:d52c465:emsdk/cmake/external/emsdk \ onnx:onnx:595228d:onnx/cmake/external/onnx CMAKE_SOURCE_PATH= ${WRKSRC}/cmake -CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= FETCHCONTENT_FULLY_DISCONNECTED \ onnxruntime_BUILD_UNIT_TESTS CMAKE_TESTING_ON= onnxruntime_BUILD_UNIT_TESTS @@ -32,17 +32,18 @@ BINARY_ALIAS= patch=gpatch DEPS_FILE= ${WRKSRC}/cmake/deps.txt +CONFLICTS_BUILD= abseil benchmark nsync googletest dlpack flatbuffers gsl mimalloc \ + nlohmann-json onnx protobuf psimd pthreadpool pybind11 re2 + dev-update-deps-in-makefiles: extract # this should be run when the port is updated @${FILEDIR} ${DEPS_FILE} pre-configure: @${REINPLACE_CMD} -E 's|;(https://.*)/([^/]+\.zip);|;file://${DISTDIR}/${DIST_SUBDIR}/\2;|' ${DEPS_FILE} -# there should be an EXTRACT_ONLY statement -# -# this port is broken at least in some ways: it has missing symbols due to excessive -# and incorrect bundling, see https://github.com/microsoft/onnxruntime/issues/22331 -# it still might be useful for some purposes, hence static libraries are installed instead of shared ones +# NOTE there should be an EXTRACT_ONLY statement +# NOTE shared libs can't be enabled because the build would fail, see discussion in this issue: https://github.com/microsoft/onnxruntime/issues/22331 +# 1 test fails, see https://github.com/microsoft/onnxruntime/issues/22353 .include .include