02/02: gnu: libffi: On powerpc, patch with --force.

[guix-commits]

marusich pushed a commit to branch master
in repository guix.

commit 662e7e28d576ada91fc9dec7d27c100666114f03
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Sun Dec 27 19:57:15 2020 -0800

    gnu: libffi: On powerpc, patch with --force.
    
    As explained in bug 45252, this is the right way to invoke it.
    
    Efraim has confirmed that it is OK to make this change on master branch for
    the generic powerpc case, even though it will in theory cause rebuilds on 
that
    architecture, since in practice it isn't actually being used yet.
    
    * gnu/packages/libffi.scm (arguments): Change the invocation of the "patch"
    tool in the case where the %current-target-system or %current-system begins
    with "powerpc", so that we invoke it using --force instead of --batch.
---
 gnu/packages/libffi.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm
index 375a792..5b8f277 100644
--- a/gnu/packages/libffi.scm
+++ b/gnu/packages/libffi.scm
@@ -66,7 +66,7 @@
                             (lambda* (#:key inputs #:allow-other-keys)
                               (let ((patch (assoc-ref inputs
                                                       "powerpc-patch")))
-                                (invoke "patch" "--batch" "-p1"
+                                (invoke "patch" "--force" "-p1"
                                         "-i" patch))))))
              '())
        ,@(if (string-prefix? "powerpc64le-" (or (%current-target-system)