GNU bug report logs - #68098
[PATCH] gnu: libid3tag: Fix cross-compiling.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68098 in the body.
You can then email your comments to 68098 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: libid3tag: Fix cross-compiling.
Date: Fri, 29 Dec 2023 20:08:29 +0800

* 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 <at> posteo.net>
 ;;; Copyright © 2022 John Kehayias <john.kehayias <at> protonmail.com>
 ;;; Copyright © 2022 Joeke de Graaf <joeke <at> posteo.net>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> 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

Message #10 received at 68098-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 68098-done <at> debbugs.gnu.org
Subject: Re: [bug#68098] [PATCH] gnu: libid3tag: Fix cross-compiling.
Date: Fri, 29 Dec 2023 18:11:12 +0100

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.