From fdb90e9ee8a578c88ef3a33067e8a532e43ae7b8 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sun, 27 Dec 2020 19:50:40 -0800 Subject: gnu: libffi: On powerpc64le, patch using --force. As explained in bug 45252, this is the right way to invoke it. * 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 "powerpc64le", so that we invoke it using --force instead of --batch. --- gnu/packages/libffi.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/libffi.scm') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 66239e0363..375a792ebf 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -76,7 +76,7 @@ (lambda* (#:key inputs #:allow-other-keys) (let ((patch (assoc-ref inputs "powerpc64le-patch"))) - (invoke "patch" "--batch" "-p1" + (invoke "patch" "--force" "-p1" "-i" patch)))))) '()))) (inputs -- cgit v1.2.3 From 662e7e28d576ada91fc9dec7d27c100666114f03 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sun, 27 Dec 2020 19:57:15 -0800 Subject: 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(-) (limited to 'gnu/packages/libffi.scm') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 375a792ebf..5b8f277009 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) -- cgit v1.2.3