mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
d285e9efae
Commit 8f88a644ed ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.
Due to this change, sdl_mixer fails to build with output:
Applying 0002-configure__set_macro_directory.patch using patch:
patching file configure.ac
Hunk #1 FAILED at 2.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.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>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
# HG changeset patch
|
|
# User "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
# Date 1581183281 -3600
|
|
# Sat Feb 08 18:34:41 2020 +0100
|
|
# Node ID 753a1f394620056c35790a571ff5f7c248445943
|
|
# Parent eb5f08bf9994bf5164ca68015f2e030c2c9dddcd
|
|
configure: set macro directory
|
|
|
|
Setting the macro directory in configure.in, rather than specifying it
|
|
on the command line, ensures that it is properly searched in the correct
|
|
order, and that autoreconf properly updates our macros with the newer
|
|
system ones, if any.
|
|
|
|
Fixes:
|
|
http://autobuild.buildroot.org/results/63a/63ae0bddb3c4436efe967c318e299047f496c5a5/build-end.log
|
|
|
|
libtool: Version mismatch error. This is libtool 2.4.6, but the
|
|
libtool: definition of this LT_INIT comes from libtool 2.2.6.
|
|
libtool: You should recreate aclocal.m4 with macros from libtool 2.4.6
|
|
libtool: and run autoconf again.
|
|
|
|
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
|
[Dario: make the patch to be applied with fuzz factor 0]
|
|
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
|
|
AC_INIT
|
|
AC_CONFIG_SRCDIR([mixer.c])
|
|
AC_CONFIG_AUX_DIR(build-scripts)
|
|
+AC_CONFIG_MACRO_DIR([acinclude])
|
|
|
|
dnl Set various version strings - taken gratefully from the GTk sources
|
|
|