diff mbox series

[bug#68082] gnu: libmng: Fix cross-compiling to riscv64-linux.

Message ID e32c2ba645c2f7f62c3e239cfd23e53ae5ad66fd.1703771878.git.zhengjunjie@iscas.ac.cn
State New
Headers show
Series [bug#68082] gnu: libmng: Fix cross-compiling to riscv64-linux. | expand

Commit Message

Zheng Junjie Dec. 28, 2023, 1:57 p.m. UTC 
* gnu/packages/image.scm (libmng)
[native-inputs]: When cross compiling to riscv64-linux-gnu, add config.
[arguments]: When target riscv64-linux-gnu, add update-config-scripts phase.

Change-Id: I906a2b7b7691ae53592cfa35ba64fc7e7d735664
---
 gnu/packages/image.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)


base-commit: bc509aba838780502b83f7fc3d2aee72903656f2

Comments

Mathieu Othacehe Dec. 29, 2023, 5:08 p.m. UTC | #1 
> * gnu/packages/image.scm (libmng)
> [native-inputs]: When cross compiling to riscv64-linux-gnu, add config.
> [arguments]: When target riscv64-linux-gnu, add update-config-scripts phase.

Applied, thanks,

Mathieu
diff mbox series

Patch

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index ebabd1c973..79f1a293ec 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1483,6 +1483,26 @@  (define-public libmng
                (base32
                 "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija"))))
     (build-system gnu-build-system)
+    (arguments
+     (if (and (target-riscv64?)
+              (%current-target-system))
+         (list #: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)
+         '()))
     (propagated-inputs
      ;; These are all in the 'Libs.private' field of libmng.pc.
      (list lcms libjpeg-turbo zlib))