[Buildroot] [PATCH] alsa-utils: fix conflics with pthread.h

Peter Korsgaard peter at korsgaard.com
Tue Dec 8 20:59:49 UTC 2015


>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera at imgtec.com> writes:

 > Backport two upstream patches to fix a build failure due to conflicts
 > with pthread.h:

 > signal.h:27: error: conflicting types for 'sin_generator_init'
 > ./signal.h:27: error: previous declaration of 'sin_generator_init' was
 > here
 > signal.h:28: error: conflicting types for 'sin_generator_next_sample'
 > ./signal.h:28: error: previous declaration of
 > 'sin_generator_next_sample' was here
 > ....

 > Upstream patches:

 >   http://git.alsa-project.org/?p=alsa-utils.git;a=commit;h=3bf8e79c3bfee3ca14277aad3d9c406dfc053bbf
 >   http://git.alsa-project.org/?p=alsa-utils.git;a=commit;h=ed0cce1b6061aade0077982cb5d22fa68ddffd2f

 > Fixes:

 >   http://autobuild.buildroot.net/results/b11/b114ac7a25ac95a059418b07c6cad25714d19b77/

 > Signed-off-by: Vicente Olivert Riera <Vincent.Riera at imgtec.com>
 > ---
 >  .../0001-bat-Avoid-local-signal.h-file.patch       | 73 ++++++++++++++++++++++
 >  ...ass-incompatible-function-pointers-to-pth.patch | 61 ++++++++++++++++++
 >  2 files changed, 134 insertions(+)
 >  create mode 100644 package/alsa-utils/0001-bat-Avoid-local-signal.h-file.patch
 >  create mode 100644 package/alsa-utils/0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch

 > diff --git a/package/alsa-utils/0001-bat-Avoid-local-signal.h-file.patch b/package/alsa-utils/0001-bat-Avoid-local-signal.h-file.patch
 > new file mode 100644
 > index 0000000..a5f7431
 > --- /dev/null
 > +++ b/package/alsa-utils/0001-bat-Avoid-local-signal.h-file.patch

> +diff --git a/bat/signal.h b/bat/bat-signal.h
 > +similarity index 100%
 > +rename from bat/signal.h
 > +rename to bat/bat-signal.h

This is a git patch with renames that is only handled by gnu patch from
version 2.7 on (from 2012). I know it is it ugly, but I think we should
use a classic "full" patch here (E.G. not generated by git format-patch
-M) for compatibility with older distributions.

Care to respin the patch with that fixed?

-- 
Bye, Peter Korsgaard


More information about the buildroot mailing list