[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
19/38: gnu: Use libunwind-next for riscv64-linux.
From: |
guix-commits |
Subject: |
19/38: gnu: Use libunwind-next for riscv64-linux. |
Date: |
Sun, 10 Oct 2021 09:28:02 -0400 (EDT) |
efraim pushed a commit to branch wip-riscv
in repository guix.
commit 928317edd4c4e422978e5f52ecf122cccd8044f7
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 c4d1280..9ae28a5 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -869,7 +869,9 @@ standard GNU style syntax for options.")
("libevent" ,libevent)
("libiberty" ,libiberty)
("libsodium" ,libsodium)
- ("libunwind" ,libunwind)
+ ,(if (target-riscv64?)
+ `("libunwind" ,libunwind-next)
+ `("libunwind" ,libunwind))
("lz4" ,lz4)
("openssl" ,openssl)
("snappy" ,snappy)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index f5f3713..c6f9cde 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -689,7 +689,9 @@ other machines/servers. Electroncash does not download the
Bitcoin Cash blockch
("expat" ,expat)
("hidapi" ,hidapi)
("libsodium" ,libsodium)
- ("libunwind" ,libunwind)
+ ,(if (target-riscv64?)
+ `("libunwind" ,libunwind-next)
+ `("libunwind" ,libunwind))
("libusb" ,libusb)
("miniupnpc" ,miniupnpc)
("openssl" ,openssl)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 50364a5..dfb98ed 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1123,7 +1123,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-riscv64?)
+ `("libunwind" ,libunwind-next)
+ `("libunwind" ,libunwind))
("libva" ,libva)
("libwebp" ,libwebp)
("libx11" ,libx11)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index be127a0..ea9d502 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11623,7 +11623,9 @@ join_paths\\('build-aux', 'post_install.py'\\)\\)")
("libhandy" ,libhandy-0.0)
("libpeas" ,libpeas)
("libsecret" ,libsecret)
- ("libunwind" ,libunwind)
+ ,(if (target-riscv64?)
+ `("libunwind" ,libunwind-next)
+ `("libunwind" ,libunwind))
("sqlite" ,sqlite)
("webkitgtk" ,webkitgtk)
("ytnef" ,ytnef)))
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2f3ff5f..31303af 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4661,7 +4661,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-riscv64?)
+ `("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..7e550ac 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-riscv64?)
+ `("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..2287e1b 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-riscv64?)
+ `("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 fe7ebd5..a2d8816 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -874,7 +874,9 @@ stream. Remote control of the module is possible over
HTTP.")
(inputs
`(("cyrus-sasl" ,cyrus-sasl)
("libev" ,libev)
- ("libunwind" ,libunwind)
+ ,(if (target-riscv64?)
+ `("libunwind" ,libunwind-next)
+ `("libunwind" ,libunwind))
("linux-pam" ,linux-pam)
("mit-krb5" ,mit-krb5)
("openldap" ,openldap)
- 17/38: gnu: texlive-latex-base: Skip JIT formats on riscv64-linux., (continued)
- 17/38: gnu: texlive-latex-base: Skip JIT formats on riscv64-linux., guix-commits, 2021/10/10
- 27/38: gnu: make-opensbi-package: Adjust installed files., guix-commits, 2021/10/10
- 32/38: gnu: postgresql: Fix building on riscv64-linux., guix-commits, 2021/10/10
- 24/38: gnu: webrtc-audio-processing: Fix riscv64 detection., guix-commits, 2021/10/10
- 20/38: gnu: libaio: Fix test suite on riscv64-linux., guix-commits, 2021/10/10
- 26/38: system: system-linux-image-file-name: Set kernel name for riscv64-linux., guix-commits, 2021/10/10
- 28/38: gnu: u-boot-sifive-unmatched: Build with opensbi., guix-commits, 2021/10/10
- 29/38: gnu: dtc: Build without valgrind on riscv64-linux., guix-commits, 2021/10/10
- 34/38: build-system/meson: Fix cross-building to riscv64-linux., guix-commits, 2021/10/10
- 35/38: gnu: gtk+: Remove some more failing tests., guix-commits, 2021/10/10
- 19/38: gnu: Use libunwind-next for riscv64-linux.,
guix-commits <=
- 23/38: gnu: mozjs-60: Add support for riscv64-linux., guix-commits, 2021/10/10
- 25/38: gnu: nss: Adjust make-flags for riscv64-linux., guix-commits, 2021/10/10
- 30/38: gnu: php: Skip tests failing on riscv64-linux., guix-commits, 2021/10/10
- 31/38: gnu: make-opensbi-package: Fix native building., guix-commits, 2021/10/10
- 33/38: gnu: isc-dhcp: Fix building on riscv64-linux., guix-commits, 2021/10/10
- 37/38: system: Add riscv64 support., guix-commits, 2021/10/10
- 38/38: gnu: libx264: Fix building on riscv64-linux., guix-commits, 2021/10/10
- 36/38: gnu: Add u-boot-sifive-unmatched-bootloader., guix-commits, 2021/10/10