bug#74470: Bug: guile-fibers@1.1.1 arm crosscompile fails due to patch on 1.3.1 version

[<janneke@gnu.org>]

Razvan Lixandru writes:

Hi,

> It looks like this commit:
> https://git.savannah.gnu.org/cgit/guix.git/commit/gnu/packages/guile-xyz.scm?id=20c7b8dd04e421a139a02438cf1ddfdfe544a446
> causes guile-fiber@1.1.1 which is pulled by shepherd to fail:
[..]
> starting phase `apply-cross-build-fix-patch'
> patching file build-aux/guile.am
> Hunk #1 FAILED at 22.

Oops.  What about something like this patch (untested)

--8<---------------cut here---------------start------------->8---
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 044a491259..a21289d368 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -937,6 +937,13 @@ (define-public guile-fibers-1.1
            guile-3.0            ;for 'guild compile
            ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'
            gettext-minimal))
+    (arguments
+     (if (%current-target-system)
+         (substitute-keyword-arguments (package-arguments guile-fibers)
+           ((#:phases phases)
+            #~(modify-phases #$phases
+                (delete 'apply-cross-build-fix-patch))))
+         (package-arguments guile-fibers)))
     (inputs
      (list guile-3.0))                            ;for libguile-3.0.so
     (supported-systems
--8<---------------cut here---------------end--------------->8---

> This happens on both arm-linux-gnueabihf and arm64-linux-gnu.
> I think it is happening because the 1.1.1 version inherits 1.3.1.
> package and it overrides the source, but the patch is still being
> applied.

Yes.

> I guess this brakes all arm* crossbuilds.

Sorry!

Greetings,
Janneke

-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com