[bug#75425] gnu: appimage-type2-runtime: Fix cross-compiling.

Message ID 0b8b70e2ec03a5e37f7fa71946f61c793c95b2ee.1736287537.git.brian@kubisiak.com
State New
Headers
Series [bug#75425] gnu: appimage-type2-runtime: Fix cross-compiling. |

Commit Message

Brian Kubisiak Jan. 7, 2025, 10:07 p.m. UTC
  * gnu/packages/appimage.scm (appimage-type2-runtime)[arguments]<#:make-flags>: Use
CC-FOR-TARGET and add "-Wno-int-conversion".

Change-Id: I5dd9c6cb81e30713f17d474e9a5e11817db7158e
---
 gnu/packages/appimage.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


base-commit: a76f2d5927c86e4a76a1d3b49c1a37054612f6c0
prerequisite-patch-id: b7500f0446826469bbf2f858e044cc3e0eae98c5
  

Comments

NoƩ Lopez Jan. 10, 2025, 10:06 a.m. UTC | #1
user guix
usertag 75425 + reviewed-looks-good
thanks

Guix QA review form submission:
Cross build works for aarch64-linux-gnu and riscv-linux-gnu. I also checked that AppImage packs still work.

Thanks for the patch!

Items marked as checked: Lint warnings, Package builds, Commit messages
  
Zheng Junjie Jan. 11, 2025, 3:22 p.m. UTC | #2
Brian Kubisiak <brian@kubisiak.com> writes:

> * gnu/packages/appimage.scm (appimage-type2-runtime)[arguments]<#:make-flags>: Use
> CC-FOR-TARGET and add "-Wno-int-conversion".
>
> Change-Id: I5dd9c6cb81e30713f17d474e9a5e11817db7158e
> ---
>  gnu/packages/appimage.scm | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/appimage.scm b/gnu/packages/appimage.scm
> index 1d0caada46..620628c053 100644
> --- a/gnu/packages/appimage.scm
> +++ b/gnu/packages/appimage.scm
> @@ -49,11 +49,13 @@ (define-public appimage-type2-runtime
>         (list
>          #:make-flags
>          #~(list "-Csrc/runtime" "runtime-fuse3"
> +                (string-append "CC=" #$(cc-for-target))
>                  (string-append
>                   "CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse/"
>                   " -DGIT_COMMIT='\"" "guix-" #$version "\"'"
>                   " -D_FILE_OFFSET_BITS=64"
> -                 " -static"))
> +                 " -static"
> +                 " -Wno-int-conversion"))
>          #:modules
>          `((guix build gnu-build-system)
>            (guix build utils)
>
> base-commit: a76f2d5927c86e4a76a1d3b49c1a37054612f6c0
> prerequisite-patch-id: b7500f0446826469bbf2f858e044cc3e0eae98c5
pushed, closing.

And fix squashfuse-for-appimage's name, indentation.
  

Patch

diff --git a/gnu/packages/appimage.scm b/gnu/packages/appimage.scm
index 1d0caada46..620628c053 100644
--- a/gnu/packages/appimage.scm
+++ b/gnu/packages/appimage.scm
@@ -49,11 +49,13 @@  (define-public appimage-type2-runtime
        (list
         #:make-flags
         #~(list "-Csrc/runtime" "runtime-fuse3"
+                (string-append "CC=" #$(cc-for-target))
                 (string-append
                  "CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse/"
                  " -DGIT_COMMIT='\"" "guix-" #$version "\"'"
                  " -D_FILE_OFFSET_BITS=64"
-                 " -static"))
+                 " -static"
+                 " -Wno-int-conversion"))
         #:modules
         `((guix build gnu-build-system)
           (guix build utils)