Skip to content

Commit b8fa676

Browse files
passgattpetazzoni
authored andcommitted
package/nushell: update the patches to be applied with fuzz 0
Commit 8f88a64 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, nushell fails to build with output: Applying 0001-uucore-add-support-for-sparc64.patch using patch: patching file VENDOR/uucore/src/lib/features/fs.rs Hunk #1 FAILED at 121. Hunk #2 FAILED at 137. 2 out of 2 hunks FAILED -- saving rejects to file VENDOR/uucore/src/lib/features/fs.rs.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
1 parent 18b1197 commit b8fa676

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

package/nushell/0001-uucore-add-support-for-sparc64.patch

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Fixes:
2828

2929
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3030
Upstream: https://github.com/uutils/coreutils/commit/d158f1a396d19cc2aed68131b80ec3b7325d108e
31+
[Dario: make the patch to be applied with fuzz factor 0]
32+
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
3133
---
3234
src/uucore/src/lib/features/fs.rs | 2 ++
3335
1 file changed, 2 insertions(+)
@@ -36,16 +38,16 @@ diff --git a/VENDOR/uucore/src/lib/features/fs.rs b/VENDOR/uucore/src/lib/featur
3638
index 20cc9e13d..3b9170bc3 100644
3739
--- a/VENDOR/uucore/src/lib/features/fs.rs
3840
+++ b/VENDOR/uucore/src/lib/features/fs.rs
39-
@@ -121,6 +121,7 @@ impl FileInformation {
40-
not(target_os = "solaris"),
41+
@@ -116,6 +116,7 @@
42+
not(target_os = "freebsd"),
4143
not(target_arch = "aarch64"),
4244
not(target_arch = "riscv64"),
4345
+ not(target_arch = "sparc64"),
4446
target_pointer_width = "64"
4547
))]
4648
return self.0.st_nlink;
47-
@@ -137,6 +138,7 @@ impl FileInformation {
48-
target_os = "solaris",
49+
@@ -127,6 +128,7 @@
50+
target_os = "freebsd",
4951
target_arch = "aarch64",
5052
target_arch = "riscv64",
5153
+ target_arch = "sparc64",

0 commit comments

Comments
 (0)