mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/redis: update the patches to be applied with fuzz 0

Browse Source 
Commit 8f88a644ed ("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 <dario.binacchi@amarulasolutions.com>
Tested-by: Titouan Christophe <titouanchristophe@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Dario Binacchi
2024-07-07 14:41:10 +02:00
committed by Thomas Petazzoni
parent 61d67ad321
commit 2ef2d436d4
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package/redis/0002-largefile-conditional-define.patch
View File

@@ -12,13 +12,15 @@ Avoids:
<command-line>:0:0: note: this is the location of the previous definition <command-line>:0:0: note: this is the location of the previous definition
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Index: redis-2.6.11/src/fmacros.h Index: redis-2.6.11/src/fmacros.h
=================================================================== ===================================================================
--- redis-2.6.11.orig/src/fmacros.h 2013-03-25 22:09:15.000000000 +0100 --- redis-2.6.11.orig/src/fmacros.h 2013-03-25 22:09:15.000000000 +0100
+++ redis-2.6.11/src/fmacros.h 2013-03-25 22:09:40.000000000 +0100 +++ redis-2.6.11/src/fmacros.h 2013-03-25 22:09:40.000000000 +0100
@@ -42,7 +42,12 @@ @@ -55,8 +55,13 @@
#define _XOPEN_SOURCE #define _POSIX_C_SOURCE 199506L
#endif #endif
+#ifndef _LARGEFILE_SOURCE +#ifndef _LARGEFILE_SOURCE
@@ -29,4 +31,5 @@ Index: redis-2.6.11/src/fmacros.h
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
+#endif +#endif
#endif /* deprecate unsafe functions
*