02/02: gnu: python-dm-tree: Use static abseil-cpp.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit f330920a14f2a9be1b6b545570c78c1dea74935a
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon Oct 30 11:35:40 2023 +0100

    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
---
 gnu/packages/python-xyz.scm | 18 ++++++++++--------
 1 file 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";)