diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2023-10-30 11:35:40 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2023-10-30 12:25:47 +0100 |
| commit | f330920a14f2a9be1b6b545570c78c1dea74935a (patch) | |
| tree | 86a3a0d7a77f202c988cae5c9c8b0a097ca1a80c | |
| parent | 6797aac408793598db0050d85391b01dc3916b7f (diff) | |
gnu: python-dm-tree: Use static abseil-cpp.
* gnu/packages/python-xyz.scm (python-dm-tree)[inputs]: Replace abseil-cpp
with static-abseil-cpp.
[arguments]: Reference static libraries.
Change-Id: I11b58ad907a3e59b98c28d6c2f6fb7bcc15be742
| -rw-r--r-- | gnu/packages/python-xyz.scm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aa75bc9226..6001e7e6eb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5851,7 +5851,10 @@ flexibility and power of the Python language.") (sha256 (base32 "0c4l9gpaqd7j34qwnpjibv53j9sm0nyl0wcy8dvh76772jxspjhg")))) (build-system pyproject-build-system) - (inputs (list pybind11 abseil-cpp python)) + ;; We link the static abseil libraries here to avoid problems in + ;; downstream libraries using potentially different variants of + ;; abseil-cpp. This is also what's done in the upstream CMake build. + (inputs (list pybind11 static-abseil-cpp python)) (propagated-inputs (list python-wheel python-absl-py python-attrs @@ -5894,13 +5897,12 @@ flexibility and power of the Python language.") "build/temp/tree/tree.o" "-Wl,--whole-archive" "-L" (string-append python "/lib") - "-L" (string-append abseil-cpp "/lib") - "-l" "absl_int128" - "-l" "absl_raw_hash_set" - "-l" "absl_raw_logging_internal" - "-l" "absl_strings" - "-l" "absl_strings_internal" - "-l" "absl_throw_delegate" + (string-append abseil-cpp "/lib/libabsl_int128.a") + (string-append abseil-cpp "/lib/libabsl_raw_hash_set.a") + (string-append abseil-cpp "/lib/libabsl_raw_logging_internal.a") + (string-append abseil-cpp "/lib/libabsl_strings.a") + (string-append abseil-cpp "/lib/libabsl_strings_internal.a") + (string-append abseil-cpp "/lib/libabsl_throw_delegate.a") "-Wl,--no-whole-archive" "-o" "build/lib/tree/_tree.so"))))))) (home-page "https://github.com/deepmind/tree") |