GNU bug report logs - #74682
[PATCH] gnu: squashfuse: 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 74682 in the body.
You can then email your comments to 74682 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: Brian Kubisiak <brian <at> kubisiak.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: squashfuse: Fix cross compiling.
Date: Tue, 3 Dec 2024 19:17:55 -0800

* gnu/packages/file-systems.scm (squashfuse)[arguments]: Use
pkg-config-for-target.
(squashfuse-for-appimage)[arguments]: Use substitute-keyword-arguments
to modify inherited phases instead of %standard-phases.

Change-Id: I6e52a94e46c5a89ba215a7eaceb7f54a80c52429
---
 gnu/packages/file-systems.scm | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 46febebb0d..0d61277f98 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -2049,6 +2049,15 @@ (define-public squashfuse
        (sha256
         (base32 "03aw8pw8694jyrzpnbry05rk9718sqw66kiyq878bbb679gl7224"))))
     (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-cross-compile
+            (lambda _
+              (substitute* "autogen.sh"
+                (("pkg-config")
+                 #$(pkg-config-for-target))))))))
     (native-inputs (list autoconf automake libtool pkg-config))
     (inputs (list attr fuse-2 xz zlib `(,zstd "lib")))
     (home-page "https://github.com/vasi/squashfuse")
@@ -2063,17 +2072,18 @@ (define-public squashfuse-for-appimage
     (package
       (inherit squashfuse)
       (arguments
-       (list
+       (cons*
         #:configure-flags
         #~'("CFLAGS=-ffunction-sections -fdata-sections -Os -no-pie"
             "LDFLAGS=-static")
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'install 'install-private-headers
-              (lambda _
-                (install-file "fuseprivate.h"
-                              (string-append #$output
-                                             "/include/squashfuse/")))))))
+        (substitute-keyword-arguments (package-arguments squashfuse)
+          ((#:phases phases)
+           #~(modify-phases #$phases
+               (add-after 'install 'install-private-headers
+                 (lambda _
+                   (install-file "fuseprivate.h"
+                                 (string-append #$output
+                                                "/include/squashfuse/")))))))))
       (inputs (list fuse-for-appimage
                     `(,zstd "lib")
                     `(,zstd "static")

base-commit: 9001514e242ad15c190588439930b0fa4f6782e3
prerequisite-patch-id: cd0707c90e1d321f3f16f2f861313dd330e9f0b4
prerequisite-patch-id: d2efb4b89763c5df04dd6d980afd8756401ba24f
-- 
2.46.0

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Brian Kubisiak <brian <at> kubisiak.com>
Cc: 74682-done <at> debbugs.gnu.org
Subject: Re: [bug#74682] [PATCH] gnu: squashfuse: Fix cross compiling.
Date: Wed, 18 Dec 2024 12:20:36 +0100

Brian Kubisiak <brian <at> kubisiak.com> skribis:

> * gnu/packages/file-systems.scm (squashfuse)[arguments]: Use
> pkg-config-for-target.
> (squashfuse-for-appimage)[arguments]: Use substitute-keyword-arguments
> to modify inherited phases instead of %standard-phases.
>
> Change-Id: I6e52a94e46c5a89ba215a7eaceb7f54a80c52429

Applied, thanks!

Previous Next

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