| Message ID | 20240702073512.2378109-1-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On 02/07/2024 09:35, Dario Binacchi wrote: > Commit 8f88a644ed7d6 ("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. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> Applied to master, thanks. Regards, Arnout > --- > .checkpackageignore | 1 - > package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch | 7 ++++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/.checkpackageignore b/.checkpackageignore > index 949b7467cfe6..0b613187a7f2 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -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 > diff --git a/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch b/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch > index 2138089b0e9f..dd9e16412c6e 100644 > --- a/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch > +++ b/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch > @@ -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 To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
diff --git a/.checkpackageignore b/.checkpackageignore index 949b7467cfe6..0b613187a7f2 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -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 diff --git a/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch b/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch index 2138089b0e9f..dd9e16412c6e 100644 --- a/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch +++ b/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch @@ -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
Commit 8f88a644ed7d6 ("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. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- .checkpackageignore | 1 - package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-)