Subject: bug#74682: closed (Re: [bug#74682] [PATCH] gnu: squashfuse: Fix cross compiling.)

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 18 Dec 2024 11:22:02 +0000

Your bug report

#74682: [PATCH] gnu: squashfuse: Fix cross compiling.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
74682: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=74682
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#74682] [PATCH] gnu: squashfuse: Fix cross compiling.
From: Ludovic Courtès <[email-masked]>
To: Brian Kubisiak <[email-masked]>
Cc: [email-masked]
Date: Wed, 18 Dec 2024 12:20:36 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Brian Kubisiak <[email-masked]> 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!

Subject: [PATCH] gnu: squashfuse: Fix cross compiling.
From: Brian Kubisiak <[email-masked]>
To: [email-masked]
Date: Tue, 3 Dec 2024 19:17:55 -0800
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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