[bug#69549] [PATCH 0/2] libtheora: Fix cross-compiling to riscv64-linux.

[bug#69549] [PATCH 0/2] libtheora: Fix cross-compiling to riscv64-linux.

[Zheng Junjie via Guix-patches]

libtheora: Fix cross-compiling to riscv64-linux.

Zheng Junjie (2):
  gnu: libtheora: Use Gexps.
  gnu: libtheora: Fix cross-compiling to riscv64-linux.

 gnu/packages/xiph.scm | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)


base-commit: 8850782392d4e58384d4c4da36a4f0bd5c8abdb1
-- 
2.41.0

[bug#69549] [PATCH 1/2] gnu: libtheora: Use Gexps.

[Zheng Junjie via Guix-patches]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1343 bytes --]

* gnu/packages/xiph.scm (libtheora): Use Gexps.

Change-Id: Ie055cd4f6cb9d2a4601b93d1f9db227598349c7c
---
 gnu/packages/xiph.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index b47c718fb6..879d8e8d39 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
 ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,7 +48,8 @@ (define-module (gnu packages xiph)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (guix gexp))
 
 (define-public libogg
   (package
@@ -115,7 +117,7 @@ (define-public libtheora
              (patches (search-patches "libtheora-config-guess.patch"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--disable-static")))
+     (list #:configure-flags #~'("--disable-static")))
     (inputs (list libvorbis))
     ;; The .pc files refer to libogg.
     (propagated-inputs (list libogg))
-- 
2.41.0

[bug#69549] [PATCH 2/2] gnu: libtheora: Fix cross-compiling to riscv64-linux.

[Zheng Junjie via Guix-patches]

* gnu/packages/xiph.scm (libtheora):
[native-inputs]: When cross compiling to riscv64-linux-gnu, add config.
[arguments]: When target riscv64-linux-gnu, add update-config phase.

Change-Id: Ie055cd4f6cb9d2a4601b93d1f9db227598349c7c
---
 gnu/packages/xiph.scm | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index 879d8e8d39..f3603c39bb 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -46,6 +46,7 @@ (define-module (gnu packages xiph)
   #:use-module (gnu packages xml)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix utils)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
@@ -117,7 +118,26 @@ (define-public libtheora
              (patches (search-patches "libtheora-config-guess.patch"))))
     (build-system gnu-build-system)
     (arguments
-     (list #:configure-flags #~'("--disable-static")))
+     (append
+      (if (and (target-riscv64?)
+               (%current-target-system))
+          (list #:phases
+                #~(modify-phases %standard-phases
+                    (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"))))))
+          '())
+      (list #:configure-flags #~'("--disable-static"))))
+    (native-inputs
+     (if (and (target-riscv64?)
+              (%current-target-system))
+         (list config)
+         '()))
     (inputs (list libvorbis))
     ;; The .pc files refer to libogg.
     (propagated-inputs (list libogg))
-- 
2.41.0

bug#69549: [PATCH 0/2] libtheora: Fix cross-compiling to riscv64-linux.

[Ludovic Courtès]

Hi,

Zheng Junjie <zhengjunjie@iscas.ac.cn> skribis:

>   gnu: libtheora: Use Gexps.
>   gnu: libtheora: Fix cross-compiling to riscv64-linux.

Applied, thanks!

Ludo’.