Skip to content

Commit 2ef2d43

Browse files
passgattpetazzoni
authored andcommitted
package/redis: 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, redis fails to build with output: Applying 0002-largefile-conditional-define.patch using patch: patching file src/fmacros.h Hunk #1 FAILED at 42. 1 out of 1 hunk FAILED -- saving rejects to file src/fmacros.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi <[email protected]> Tested-by: Titouan Christophe <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]>
1 parent 61d67ad commit 2ef2d43

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

package/redis/0002-largefile-conditional-define.patch

+6-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ Avoids:
1212
<command-line>:0:0: note: this is the location of the previous definition
1313

1414
Signed-off-by: Thomas Petazzoni <[email protected]>
15+
[Dario: make the patch to be applied with fuzz factor 0]
16+
Signed-off-by: Dario Binacchi <[email protected]>
1517

1618
Index: redis-2.6.11/src/fmacros.h
1719
===================================================================
1820
--- redis-2.6.11.orig/src/fmacros.h 2013-03-25 22:09:15.000000000 +0100
1921
+++ redis-2.6.11/src/fmacros.h 2013-03-25 22:09:40.000000000 +0100
20-
@@ -42,7 +42,12 @@
21-
#define _XOPEN_SOURCE
22+
@@ -55,8 +55,13 @@
23+
#define _POSIX_C_SOURCE 199506L
2224
#endif
2325

2426
+#ifndef _LARGEFILE_SOURCE
@@ -29,4 +31,5 @@ Index: redis-2.6.11/src/fmacros.h
2931
#define _FILE_OFFSET_BITS 64
3032
+#endif
3133

32-
#endif
34+
/* deprecate unsafe functions
35+
*

0 commit comments

Comments
 (0)