git: c5df5c6227c1 - 2024Q4 - misc/onnxruntime: Remove BUILD_SHARED_LIBS; Add CONFLICTS_BUILD
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 13 Oct 2024 19:07:04 UTC
The branch 2024Q4 has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c5df5c6227c1bda1057c909ed3fc9250f29bd4bf
commit c5df5c6227c1bda1057c909ed3fc9250f29bd4bf
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-10-09 00:08:56 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
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 <Makefile.MASTER_SITES>
.include <Makefile.DISTFILES>