02/02: gnu: Use libunwind-next for riscv64-linux.

[guix-commits]

efraim pushed a commit to branch wip-riscv
in repository guix.

commit 0cdc3542b1be7a1e375220c6d6435e255fbb5a6f
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Aug 19 16:43:11 2021 +0300

    gnu: Use libunwind-next for riscv64-linux.
    
    * gnu/packages/cpp.scm (folly)[inputs]: Use libunwind-next in place of
    libunwind on riscv64-linux.
    * gnu/packages/finance.scm (monero)[inputs],
    * gnu/packages/freedesktop.scm (weston)[inputs],
    * gnu/packages/gnome.scm (geary)[inputs],
    * gnu/packages/linux.scm (perf)[inputs],
    * gnu/packages/profiling.scm (make-scorep)[inputs],
    * gnu/packages/prolog.scm (swi-prolog)[inputs],
    * gnu/packages/web.scm (lighttpd)[inputs]: Same.
---
 gnu/packages/cpp.scm         | 4 +++-
 gnu/packages/finance.scm     | 4 +++-
 gnu/packages/freedesktop.scm | 4 +++-
 gnu/packages/gnome.scm       | 4 +++-
 gnu/packages/linux.scm       | 4 +++-
 gnu/packages/profiling.scm   | 4 +++-
 gnu/packages/prolog.scm      | 5 ++++-
 gnu/packages/web.scm         | 4 +++-
 8 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 42e9d50..95cbfac 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -804,7 +804,9 @@ standard GNU style syntax for options.")
        ("libevent" ,libevent)
        ("libiberty" ,libiberty)
        ("libsodium" ,libsodium)
-       ("libunwind" ,libunwind)
+       ,(if (target-riscv?)
+          `("libunwind" ,libunwind-next)
+          `("libunwind" ,libunwind))
        ("lz4" ,lz4)
        ("openssl" ,openssl)
        ("snappy" ,snappy)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index c5e9039..66f16cc 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -674,7 +674,9 @@ other machines/servers.  Electroncash does not download the 
Bitcoin Cash blockch
        ("expat" ,expat)
        ("hidapi" ,hidapi)
        ("libsodium" ,libsodium)
-       ("libunwind" ,libunwind)
+       ,(if (target-riscv?)
+          `("libunwind" ,libunwind-next)
+          `("libunwind" ,libunwind))
        ("libusb" ,libusb)
        ("miniupnpc" ,miniupnpc)
        ("openssl" ,openssl)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a7766ed..aa03078 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1097,7 +1097,9 @@ protocol either in Wayland core, or some other protocol 
in wayland-protocols.")
        ("libinput" ,libinput-minimal)
        ("libjpeg" ,libjpeg-turbo)
        ("libpng" ,libpng)
-       ("libunwind" ,libunwind)
+       ,(if (target-riscv?)
+          `("libunwind" ,libunwind-next)
+          `("libunwind" ,libunwind))
        ("libva" ,libva)
        ("libwebp" ,libwebp)
        ("libx11" ,libx11)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4750f64..1935ab1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11339,7 +11339,9 @@ join_paths\\('build-aux', 'post_install.py'\\)\\)")
        ("libhandy" ,libhandy-0.0)
        ("libpeas" ,libpeas)
        ("libsecret" ,libsecret)
-       ("libunwind" ,libunwind)
+       ,(if (target-riscv?)
+          `("libunwind" ,libunwind-next)
+          `("libunwind" ,libunwind))
        ("sqlite" ,sqlite)
        ("webkitgtk" ,webkitgtk)
        ("ytnef" ,ytnef)))
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index bb57466..17a0015 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4404,7 +4404,9 @@ in a digital read-out.")
        ("python" ,python-2)                    ;'perf' links against libpython
        ("elfutils" ,elfutils)
        ("libiberty" ,libiberty)      ;used alongside BDF for symbol demangling
-       ("libunwind" ,libunwind)      ;better stack walking
+       ,(if (target-riscv?)
+          `("libunwind" ,libunwind-next)
+          `("libunwind" ,libunwind))           ;better stack walking
        ("numactl" ,numactl)          ;for 'perf bench numa mem'
 
        ;; Documentation.
diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm
index b4d52d8..58bc9b9 100644
--- a/gnu/packages/profiling.scm
+++ b/gnu/packages/profiling.scm
@@ -348,7 +348,9 @@ different kinds of performance behavior.")
      `(("mpi" ,mpi)
        ("papi" ,papi)
        ("opari2" ,opari2)
-       ("libunwind" ,libunwind)
+       ,(if (target-riscv?)
+          `("libunwind" ,libunwind-next)
+          `("libunwind" ,libunwind))
        ("otf2" ,otf2)
        ("cubelib" ,cube "lib")                    ;for lib, include
        ("openmpi" ,openmpi)
diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm
index 4eb0f4d..a98ab01 100644
--- a/gnu/packages/prolog.scm
+++ b/gnu/packages/prolog.scm
@@ -23,6 +23,7 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
@@ -121,7 +122,9 @@ manner.  It also features an interactive interpreter.")
        ("readline" ,readline)
        ("texinfo" ,texinfo)
        ("libarchive" ,libarchive)
-       ("libunwind" ,libunwind)
+       ,(if (target-riscv?)
+          `("libunwind" ,libunwind-next)
+          `("libunwind" ,libunwind))
        ("libjpeg" ,libjpeg-turbo)
        ("libxft" ,libxft)
        ("fontconfig" ,fontconfig)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 786804b..f1bc803 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -873,7 +873,9 @@ stream.  Remote control of the module is possible over 
HTTP.")
     (inputs
      `(("cyrus-sasl" ,cyrus-sasl)
        ("libev" ,libev)
-       ("libunwind" ,libunwind)
+       ,(if (target-riscv?)
+          `("libunwind" ,libunwind-next)
+          `("libunwind" ,libunwind))
        ("linux-pam" ,linux-pam)
        ("mit-krb5" ,mit-krb5)
        ("openldap" ,openldap)