aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/onnx-shared-libraries.patch
blob: 00583b35daf2c72c10ff173fed80bfd14603a5aa (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
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)
ix indentation. Maxim Cournoyer 2020-11-19gnu: python-oslosphinx: Update to 4.18.0....* gnu/packages/openstack.scm (python-oslosphinx): Update to 4.18.0. [phases]: Delete 'check replacement. Add a 'relax-requirements phase. [native-inputs]: Remove python-docutils. Add python-openstackdocstheme and python-reno. (python2-oslosphinx): Remove variable. Maxim Cournoyer 2020-11-19gnu: python-oslosphinx: Fix indentation....* gnu/packages/openstack.scm (python-oslosphinx): Fix indentation. Maxim Cournoyer 2020-11-19gnu: python-oslo: Update to 3.1.1....* gnu/packages/openstack.scm (python-oslo): Update to 3.1.1. [phases]: Add new 'relax-requirements phase. [propagated-inputs]: Move python-pbr... [native-inputs]: ...here. Add python-bandit, python-coverage and python-stestr. Maxim Cournoyer 2020-11-19gnu: python-hacking: Update to 4.0.0....Fixes <https://issues.guix.gnu.org/39871>. * gnu/packages/openstack.scm (python-hacking): Update to 4.0.0. [arguments]: Remove field. [propagated-inputs]: Remove python-flake8-2.6, python-mccabe-0.2.1, python-pbr, python-pep8-1.5.7, python-pyflakes-1.2, python-six. Add python-flake8. [native-inputs]: Remove python-reno and python-testrepository. Add python-coverage, python-ddt, python-dnspython, python-fixtures, python-monotonic, python-subunit, python-stestr and python-testtools. (python2-hacking): Remove variable. * gnu/packages/python-xyz.scm (python-pyflakes-1.2) (python-mccabe-0.2.1, python2-mccabe-0.2.1) (python-pep8-1.5.7, python2-pep8-1.5.7) (python-flake8-2.6): Delete variables. Maxim Cournoyer 2020-11-19gnu: Add python-cliff....* gnu/packages/openstack.scm (python-cliff): New variable. Maxim Cournoyer 2020-11-19gnu: python-bandit: Fix indentation....* gnu/packages/openstack.scm (python-bandit): Fix indentation. Maxim Cournoyer 2020-11-19gnu: python-bandit: Update to 1.6.2....* gnu/packages/openstack.scm (python-bandit): Update to 1.6.2. [phases]: Remove argument. [tests?]: Disable test suite. [native-inputs]: Remove python-beautifulsoup4, python-fixtures, python-mock, python-subunit, python-testrepository, python-testscenarios and python-testtools. Add python-pbr. Maxim Cournoyer 2020-11-19gnu: python-oslotest: Update to 4.4.1....* gnu/packages/openstack.scm (python-oslotest): Update to 4.4.1. [tests?]: Disable test suite. [propagated-inputs]: Remove python-mock, python-mox3, python-os-client-config and python-testrepository. [native-inputs]: Remove field. Maxim Cournoyer 2020-11-19gnu: python-oslotest: Re-indent....* gnu/packages/openstack.scm (python-oslotest): Fix indentation. Maxim Cournoyer 2020-11-19gnu: python-stevedore: Update to 3.2.2....* gnu/packages/openstack.scm (python-stevedore): Update to 3.2.2. [tests?]: Disable tests. [propagated-inputs]: Remove field. Move python-pbr to... [native-inputs]: ...here. Remove python-mock, python-sphinx and python-testrepository. Maxim Cournoyer 2020-07-07gnu: python-bandit: Update home-page....* gnu/packages/openstack.scm (python-bandit)[home-page]: Update to new URL. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr> Matthew Kraai 2020-04-30gnu: python-hacking: Update to 1.1.0....* gnu/packages/openstack.scm (python-hacking): Update to 1.1.0. [arguments]: Add "delete-broken-test" phase. [propagated-inputs]: Replace python-flake8-2.5 with python-flake8-2.6. Ricardo Wurmus 2020-04-30gnu: Replace python-pyflakes-0.8.1 with python-pyflakes-1.2....* gnu/packages/python-xyz.scm (python-pyflakes-0.8.1): Remove variable. (python-pyflakes-1.2): New variable. * gnu/packages/openstack.scm (python-hacking)[propagated-inputs]: Replace python-pyflakes-0.8.1 with python-pyflakes-1.2. Ricardo Wurmus