328721a6e0
Commit 8f88a644ed ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.
Due to this change, libnfs fails to build with output:
Applying 0001-Fix-include-sys-time.h.patch using patch:
patching file include/nfsc/libnfs.h
Hunk #1 FAILED at 24.
1 out of 1 hunk FAILED -- saving rejects to file include/nfsc/libnfs.h.rej
This commit refreshes the package patch on the current package version.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 9df082012cba1dc32d83e5e8b0bdc0892f250058 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
|
Date: Mon, 5 Nov 2018 00:43:07 +0100
|
|
Subject: [PATCH] Fix include sys/time.h
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
POSIX says `struct timeval` is defined if <sys/time.h> is included.
|
|
|
|
Instead of the mess that is currently done based on the system on which
|
|
the stuff is being compiled, include it unconditionally.
|
|
|
|
Upstream: https://github.com/sahlberg/libnfs/issues/272
|
|
|
|
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
|
[Fabrice: update for 5.0.2]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Dario: make the patch to be applied with fuzz factor 0]
|
|
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
---
|
|
include/nfsc/libnfs.h | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h
|
|
index 09dcf1c..b6db58c 100755
|
|
--- a/include/nfsc/libnfs.h
|
|
+++ b/include/nfsc/libnfs.h
|
|
@@ -28,12 +28,7 @@
|
|
#endif
|
|
|
|
#include <stdint.h>
|
|
-#if defined(__ANDROID__) || defined(AROS) || defined(__PPU__) \
|
|
- || ( defined(__APPLE__) && defined(__MACH__) ) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
|
#include <sys/time.h>
|
|
-#else
|
|
-#include <time.h>
|
|
-#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
--
|
|
2.19.1
|
|
|