--- Begin Message ---
|
Subject: |
[PATCH] gnu: cdparanoia: Fix cross-compiling. |
|
Date: |
Tue, 26 Dec 2023 22:26:45 +0800 |
* gnu/packages/cdrom.scm (cdparanoia)
[native-inputs]: when cross compiling to riscv64-linux-gnu, add config.
[arguments]: when target riscv64-linux-gnu, add update-config-scripts phase.
<#:configure-flags>: when cross-compiling, use `(assoc-ref %outputs "out")'.
Change-Id: I442c668c3d52c241f0d405f51ea8d995bfefd3fd
---
gnu/packages/cdrom.scm | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index aaa2e50293..4e858c571f 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -14,6 +14,7 @@
;;; Copyright ?? 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright ?? 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright ?? 2020 Timotej Lazar <timotej.lazar@araneo.si>
+;;; Copyright ?? 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -233,10 +234,33 @@ (define-public cdparanoia
`(#:tests? #f ; there is no check target
#:parallel-build? #f ;randomly fails to link
#:configure-flags ; Add $libdir to the RUNPATH of all the executables.
- (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
+ (list (string-append "LDFLAGS=-Wl,-rpath="
+ ,(if (%current-target-system)
+ '(assoc-ref %outputs "out")
+ '%output)
+ "/lib"))
;; Building in parallel is flaky: ???ld: [???]/cachetest.c:393:
undefined
;; reference to `paranoia_free'???.
- #:parallel-build? #f))
+ #:parallel-build? #f
+ ,@(if (and (target-riscv64?)
+ (%current-target-system))
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'update-config-scripts
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ ;; Replace outdated config.guess and config.sub.
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "."))
+ '("config.guess" "config.sub"))))))
+ '())))
+ (native-inputs
+ (if (and (target-riscv64?)
+ (%current-target-system))
+ (list config)
+ '()))
(home-page "https://www.xiph.org/paranoia/";)
(synopsis "Audio CD reading utility")
(description "Cdparanoia retrieves audio tracks from CDDA capable CDROM
base-commit: 0d13d095420861022e68e87ceebd5e037e12a8b3
--
2.41.0
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#68048] [PATCH v2] gnu: cdparanoia: Fix cross-compiling. |
|
Date: |
Thu, 28 Dec 2023 10:18:13 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) |
> * gnu/packages/cdrom.scm (cdparanoia)
> [native-inputs]: when cross compiling to {riscv,aarch}64-linux-gnu, add
> config.
> [arguments]: when target {riscv,aarch}64-linux-gnu, add update-config-scripts
> phase.
> <#:configure-flags>: when cross-compiling, use `(assoc-ref %outputs "out")'.
Applied, thanks,
Mathieu
--- End Message ---