amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python-onnx: Rename to "onnx".

Browse source 
* gnu/packages/machine-learning.scm (python-onnx): Rename to...
(onnx): ... this, and change 'name' field accordingly.
(python-onnx): New variable.
* gnu/packages/patches/python-onnx-shared-libraries.patch: Rename to...
* gnu/packages/patches/onnx-shared-libraries.patch: ... this.
* gnu/packages/patches/python-onnx-use-system-googletest.patch: Rename
to...
* gnu/packages/patches/onnx-use-system-googletest.patch: ... this.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2021-07-30 17:19:34 +02:00 • committed by Ludovic Courtès
parent 2b55f914c3
commit fa2d94b5e3
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/patches/python-onnx-shared-libraries.patch
View file

@ -1,24 +0,0 @@
These linker options for the 'onnx_cpp2py_export.cpython-38-*-gnu.so'
(or similar) extension are meant to be used when building 'libonn.a',
a static archive. This patch adapts the link flags to linking with
'libonnx.so'.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cede3073..52f846ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -475,11 +475,10 @@ if(BUILD_ONNX_PYTHON)
PRIVATE $<TARGET_OBJECTS:onnx>)
else()
# Assume everything else is like gcc
- target_link_libraries(onnx_cpp2py_export
- PRIVATE "-Wl,--whole-archive" $<TARGET_FILE:onnx>
- "-Wl,--no-whole-archive")
+ target_link_libraries(onnx_cpp2py_export PRIVATE onnx)
set_target_properties(onnx_cpp2py_export
- PROPERTIES LINK_FLAGS "-Wl,--exclude-libs,ALL")
+ PROPERTIES LINK_FLAGS
+ "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib")
endif()
target_link_libraries(onnx_cpp2py_export PRIVATE onnx)