* [bug#68098] [PATCH] gnu: libid3tag: Fix cross-compiling.
@ 2023-12-29 12:08 Zheng Junjie
2023-12-29 17:11 ` bug#68098: " Mathieu Othacehe
0 siblings, 1 reply; 2+ messages in thread
From: Zheng Junjie @ 2023-12-29 12:08 UTC (permalink / raw)
To: 68098
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2170 bytes --]
* gnu/packages/mp3.scm (libid3tag)
[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.
Change-Id: I715e20b7d0aeabe7eba76185b542d9d184167448
---
gnu/packages/mp3.scm | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 7ede16f4bb..67b1528a7f 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Joeke de Graaf <joeke@posteo.net>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -161,7 +162,28 @@ (define-public libid3tag
Version: ~a~@
Libs: -L${libdir} -lid3tag -lz~@
Cflags: -I${includedir}~%"
- out ,version)))))))))
+ out ,version))))))
+ ,@(if (and (%current-target-system)
+ (or (target-riscv64?)
+ (target-aarch64?)))
+ `((add-after 'unpack
+ 'update-config
+ (lambda* (#:key native-inputs inputs
+ #:allow-other-keys)
+ (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 (%current-target-system)
+ (or (target-riscv64?)
+ (target-aarch64?)))
+ (list config)
+ '()))
(inputs (list zlib))
(synopsis "Library for reading ID3 tags")
(description
base-commit: f90d6adec787187f7929159e3327c73245d3bbe3
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#68098: [PATCH] gnu: libid3tag: Fix cross-compiling.
2023-12-29 12:08 [bug#68098] [PATCH] gnu: libid3tag: Fix cross-compiling Zheng Junjie
@ 2023-12-29 17:11 ` Mathieu Othacehe
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Othacehe @ 2023-12-29 17:11 UTC (permalink / raw)
To: Zheng Junjie; +Cc: 68098-done
Hello,
> + ,@(if (and (%current-target-system)
> + (or (target-riscv64?)
> + (target-aarch64?)))
> + `((add-after 'unpack
> + 'update-config
> + (lambda* (#:key native-inputs inputs
> + #:allow-other-keys)
> + (for-each
> + (lambda (file)
> + (install-file
> + (search-input-file
> + (or native-inputs inputs)
> + (string-append
> + "/bin/" file)) "."))
> + '("config.guess" "config.sub")))))
> + '()))))
It is important to stay below the 78 columns limit but, going the other
direction decreases the readability. I joined a few lines before
applying.
Thanks,
Mathieu
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-29 17:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-29 12:08 [bug#68098] [PATCH] gnu: libid3tag: Fix cross-compiling Zheng Junjie
2023-12-29 17:11 ` bug#68098: " Mathieu Othacehe
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).