mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-23 13:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/ficl: 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, ficl fails to build with output:

    Applying 0002-Makefile.linux-pass-LDFLAGS.patch using patch:
    patching file Makefile.linux
    Hunk #1 FAILED at 14.
    1 out of 1 hunk FAILED -- saving rejects to file Makefile.linux.rej

This commit refreshes the package patch on the current package version.

While we're at it, fix the usage of the Upstream: tag and update
.checkpackageignore accordingly.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Dario Binacchi 2024-07-02 09:35:12 +02:00 committed by Arnout Vandecappelle
parent 3fb44cc367
commit e987d16478
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpackageignore
View File

@ -615,7 +615,6 @@ package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch li
package/ffmpeg/0003-libavutil-Fix-mips-build.patch lib_patch.Upstream
package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch lib_patch.Upstream
package/ficl/0001-fix-Makefile.patch lib_patch.Upstream
package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch lib_patch.Upstream
package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch lib_patch.Upstream
package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch lib_patch.Upstream
package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch lib_patch.Upstream

7
package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch
View File

@ -12,7 +12,9 @@ Fixes:
- http://autobuild.buildroot.org/results/bf041723ed813746c61892262630a3ac2bc43b14
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: upstream is dead]
Upstream: upstream is dead
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Makefile.linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@ -21,8 +23,7 @@ diff --git a/Makefile.linux b/Makefile.linux
index 5f1a41f..df887e6 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -14,7 +14,7 @@ MAJOR = 4
MINOR = 0.31
@@ -14,6 +14,6 @@ MINOR = 1.0
ficl: main.o $(HEADERS) libficl.a
- $(CC) main.o -o ficl -L. -lficl -lm