diff options
| author | Brian Kubisiak <brian@kubisiak.com> | 2024-12-03 19:17:55 -0800 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-12-18 13:22:48 +0100 |
| commit | 6930741eb5577da41df7b6769f1c028dfaac8556 (patch) | |
| tree | edd9f6c8fe8987c718740ecd2311630b32acb4a5 /gnu | |
| parent | 27a371ff947dba5afa8361669f5b8c648f15f1ba (diff) | |
| download | guix-6930741eb5577da41df7b6769f1c028dfaac8556.tar.gz guix-6930741eb5577da41df7b6769f1c028dfaac8556.zip | |
gnu: squashfuse: Fix cross compiling.
* 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
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/file-systems.scm | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 477f4d0d24..778cba53ed 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -2049,6 +2049,15 @@ the XDG directory specification from @file{~/.@var{name}} to (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 @@ memory-efficient.") (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") |