From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] alsa-utils: fix conflics with pthread.h
Date: Tue, 08 Dec 2015 21:59:49 +0100 [thread overview]
Message-ID: <87wpsolkqi.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <1449501826-39207-1-git-send-email-Vincent.Riera@imgtec.com> (Vicente Olivert Riera's message of "Mon, 7 Dec 2015 15:23:46 +0000")
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@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@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
next prev parent reply other threads:[~2015-12-08 20:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 15:23 [Buildroot] [PATCH] alsa-utils: fix conflics with pthread.h Vicente Olivert Riera
2015-12-08 20:59 ` Peter Korsgaard [this message]
2015-12-09 10:44 ` [Buildroot] [PATCH v2] " Vicente Olivert Riera
2015-12-10 22:06 ` Peter Korsgaard
2015-12-09 10:47 ` [Buildroot] [PATCH] " Vicente Olivert Riera
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wpsolkqi.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox