From nobody Wed Oct 09 03:17:37 2024 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 4XNdNx6Dz7z5YkNR; Wed, 09 Oct 2024 03:17:37 +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 4XNdNx5c0vz4xRd; Wed, 9 Oct 2024 03:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728443857; 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=Toid4YKuACW4fw19W+taXxqi6BeV7Gd36YI3+Tdn9pQ=; b=J7fun6KnSKjcqK/H2k5zQwfnBfMwQqF5zwMtAmQWoMxZky4lqHL99VlASMNj5cqV9xd6Ph +Sc1WoUcZ02u5aEJDdBrSD4mPjmPkYbDaGbybP8mbfBwadmNsG7L7gWoXjCVBUCg6bSt5F avc1/DMQeqBEvby9Yp4kCXff9VD1bCOHB+6cAbQt4Gb2s+z3RSL59V8qObw+FC8eH6gi3H wXxbtsVVJ3odIiRzZWaoM00cdpsRzkLOMlE4CgmG4mqbZ21SRetoUNK+oVI4lRJxvLN7V8 FpT5tii7FUDP1mlwZUovT+pc6NoqrnR7Pkp+9f5h7LV7uHYyBqM6jLhTaOZ4yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728443857; 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=Toid4YKuACW4fw19W+taXxqi6BeV7Gd36YI3+Tdn9pQ=; b=gKrWH4IgyEQmm1FW+6BrN7wpuH3/Mp6FpplDTYavRYBca0QuAFIki8AfKFyzsoNpVIDV/z DCe+7Qaa3vlBQumBgzwwcR/TeAtrgnydaL9is5IPBeRBCYyA7ULPCV5Mi6hHZib/4jQlxE 2RQ7b70sR4sO414ZeNoZm1ABr3/0Ojqe0lUA5/qFZ16nGjSmFNtvfGoqKcmiTuciVAE67b gpeFoJbnjps1cDgBuyWpJ0ywe24PwsxZ3sHfq3xJXGlCMltGYj1d9wm/kiBsOGQfsLBcQm Avh/brIF4Q1w+JZwHkaNr0sspr/pkGrm3BhQ4VItWYcIGG6kG7D+qXRGukvW2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728443857; a=rsa-sha256; cv=none; b=sBp69OQe/vHSCvJrB766/bAraqiVBGWYMDFalTnfbas7oT0I/RjaEbrhQSrs79vBf7iOaK O7s97h39qUNrWGePv3VhqLpgpA4pmOE2Ex/OmV51vC1MeVBFnbUKC0nFJy36INN4G0IUb2 aCvdSh1B9h7eAaxWSnJ1tJnpw7zjgiwdFPTmlHw7GwcMeAa3do4UM6QaOMemujxiC1OR49 thKGF7L8WMI4GhmAtp2IqfnpNfPQV1+qPk/hQt5oTradktLFEcDjA/AKwvC7iPHXnWJih6 MXQKUal0OTsDmcKdvWFdn80LLeATksaIAjmNS2HOscFOovRJLrVcRbjw/WdpXA== 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 4XNdNx4zx8zxdT; Wed, 9 Oct 2024 03:17:37 +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 4993HbDK007073; Wed, 9 Oct 2024 03:17:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4993Hbox007070; Wed, 9 Oct 2024 03:17:37 GMT (envelope-from git) Date: Wed, 9 Oct 2024 03:17:37 GMT Message-Id: <202410090317.4993Hbox007070@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: b3cce401eab1 - main - misc/onnxruntime: Remove BUILD_SHARED_LIBS; Add CONFLICTS_BUILD 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: b3cce401eab1ceeb04a0c6fb78f15371c54a52bf Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3cce401eab1ceeb04a0c6fb78f15371c54a52bf commit b3cce401eab1ceeb04a0c6fb78f15371c54a52bf Author: Yuri Victorovich AuthorDate: 2024-10-09 00:08:56 +0000 Commit: Yuri Victorovich CommitDate: 2024-10-09 03:17:32 +0000 misc/onnxruntime: Remove BUILD_SHARED_LIBS; Add CONFLICTS_BUILD All tests except for one succeed now. --- 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