* [Buildroot] [PATCH] alsa-utils: fix conflics with pthread.h
@ 2015-12-07 15:23 Vicente Olivert Riera
2015-12-08 20:59 ` Peter Korsgaard
0 siblings, 1 reply; 5+ messages in thread
From: Vicente Olivert Riera @ 2015-12-07 15:23 UTC (permalink / raw)
To: buildroot
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
@@ -0,0 +1,73 @@
+bat: Avoid local signal.h file
+
+Patch backported from upstream:
+
+ http://git.alsa-project.org/?p=alsa-utils.git;a=commit;h=3bf8e79c3bfee3ca14277aad3d9c406dfc053bbf
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+From 3bf8e79c3bfee3ca14277aad3d9c406dfc053bbf Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 9 Nov 2015 14:04:11 +0100
+Subject: [PATCH 1/2] bat: Avoid local signal.h file
+
+The local header file named as "signal.h" causes mysterious compile
+error when built with an old glibc.
+ 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
+ ....
+
+This turned out to be the conflict of signal.h; namely, pthread.h that
+is included before our local signal.h also includes "pthread.h".
+Since our local "signal.h" has a higher priority, it gets loaded
+instead of the expected pthread's one. Then we load it again, and it
+screws up.
+
+Although it's basically a bug of pthread, it's anyway not good to have
+a header file conflicting with the standard header file. So, let's
+name it more explicitly as specific to BAT, bat-signal.h, for avoiding
+such a conflict.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ bat/Makefile.am | 2 +-
+ bat/alsa.c | 2 +-
+ bat/{signal.h => bat-signal.h} | 0
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+ rename bat/{signal.h => bat-signal.h} (100%)
+
+diff --git a/bat/Makefile.am b/bat/Makefile.am
+index 842ae6b..f0dc5ab 100644
+--- a/bat/Makefile.am
++++ b/bat/Makefile.am
+@@ -13,7 +13,7 @@ bat_SOURCES = \
+
+ noinst_HEADERS = \
+ common.h \
+- signal.h \
++ bat-signal.h \
+ alsa.h \
+ convert.h \
+ analyze.h
+diff --git a/bat/alsa.c b/bat/alsa.c
+index 582c604..d31a633 100644
+--- a/bat/alsa.c
++++ b/bat/alsa.c
+@@ -27,7 +27,7 @@
+
+ #include "common.h"
+ #include "alsa.h"
+-#include "signal.h"
++#include "bat-signal.h"
+
+ struct pcm_container {
+ snd_pcm_t *handle;
+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
+--
+2.4.10
+
diff --git a/package/alsa-utils/0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch b/package/alsa-utils/0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch
new file mode 100644
index 0000000..68015cf
--- /dev/null
+++ b/package/alsa-utils/0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch
@@ -0,0 +1,61 @@
+bat: Don't pass incompatible function pointers to
+
+Patch backported from upstream:
+
+ http://git.alsa-project.org/?p=alsa-utils.git;a=commit;h=ed0cce1b6061aade0077982cb5d22fa68ddffd2f
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+From ed0cce1b6061aade0077982cb5d22fa68ddffd2f Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 9 Nov 2015 14:09:50 +0100
+Subject: [PATCH 2/2] bat: Don't pass incompatible function pointers to
+ pthread_cleanup_push()
+
+pthread_cleanup_push() takes a function pointer for void (void *).
+Although it may work in most cases, we shouldn't pass an incompatible
+function pointer there, as some old gcc complains:
+ alsa.c:560: warning: initialization from incompatible pointer type
+ alsa.c:562: warning: initialization from incompatible pointer type
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ bat/alsa.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/bat/alsa.c b/bat/alsa.c
+index d31a633..5eaa25b 100644
+--- a/bat/alsa.c
++++ b/bat/alsa.c
+@@ -505,6 +505,16 @@ static int read_from_pcm_loop(FILE *fp, int count,
+ return 0;
+ }
+
++static void pcm_cleanup(void *p)
++{
++ snd_pcm_close(p);
++}
++
++static void file_cleanup(void *p)
++{
++ fclose(p);
++}
++
+ /**
+ * Record
+ */
+@@ -557,9 +567,9 @@ void *record_alsa(struct bat *bat)
+
+ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+ pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+- pthread_cleanup_push(snd_pcm_close, sndpcm.handle);
++ pthread_cleanup_push(pcm_cleanup, sndpcm.handle);
+ pthread_cleanup_push(free, sndpcm.buffer);
+- pthread_cleanup_push(fclose, fp);
++ pthread_cleanup_push(file_cleanup, fp);
+
+ err = write_wav_header(fp, &wav, bat);
+ if (err != 0) {
+--
+2.4.10
+
--
2.4.10
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] alsa-utils: fix conflics with pthread.h
2015-12-07 15:23 [Buildroot] [PATCH] alsa-utils: fix conflics with pthread.h Vicente Olivert Riera
@ 2015-12-08 20:59 ` Peter Korsgaard
2015-12-09 10:44 ` [Buildroot] [PATCH v2] " Vicente Olivert Riera
2015-12-09 10:47 ` [Buildroot] [PATCH] " Vicente Olivert Riera
0 siblings, 2 replies; 5+ messages in thread
From: Peter Korsgaard @ 2015-12-08 20:59 UTC (permalink / raw)
To: buildroot
>>>>> "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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] alsa-utils: fix conflics with pthread.h
2015-12-08 20:59 ` Peter Korsgaard
@ 2015-12-09 10:44 ` Vicente Olivert Riera
2015-12-10 22:06 ` Peter Korsgaard
2015-12-09 10:47 ` [Buildroot] [PATCH] " Vicente Olivert Riera
1 sibling, 1 reply; 5+ messages in thread
From: Vicente Olivert Riera @ 2015-12-09 10:44 UTC (permalink / raw)
To: buildroot
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 | 143 +++++++++++++++++++++
...ass-incompatible-function-pointers-to-pth.patch | 61 +++++++++
2 files changed, 204 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..250f77d
--- /dev/null
+++ b/package/alsa-utils/0001-bat-Avoid-local-signal.h-file.patch
@@ -0,0 +1,143 @@
+bat: Avoid local signal.h file
+
+Patch backported from upstream:
+
+ http://git.alsa-project.org/?p=alsa-utils.git;a=commit;h=3bf8e79c3bfee3ca14277aad3d9c406dfc053bbf
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+From 3bf8e79c3bfee3ca14277aad3d9c406dfc053bbf Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 9 Nov 2015 14:04:11 +0100
+Subject: [PATCH 1/2] bat: Avoid local signal.h file
+
+The local header file named as "signal.h" causes mysterious compile
+error when built with an old glibc.
+ 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
+ ....
+
+This turned out to be the conflict of signal.h; namely, pthread.h that
+is included before our local signal.h also includes "pthread.h".
+Since our local "signal.h" has a higher priority, it gets loaded
+instead of the expected pthread's one. Then we load it again, and it
+screws up.
+
+Although it's basically a bug of pthread, it's anyway not good to have
+a header file conflicting with the standard header file. So, let's
+name it more explicitly as specific to BAT, bat-signal.h, for avoiding
+such a conflict.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ bat/Makefile.am | 2 +-
+ bat/alsa.c | 2 +-
+ bat/bat-signal.h | 30 ++++++++++++++++++++++++++++++
+ bat/signal.h | 30 ------------------------------
+ 4 files changed, 32 insertions(+), 32 deletions(-)
+ create mode 100644 bat/bat-signal.h
+ delete mode 100644 bat/signal.h
+
+diff --git a/bat/Makefile.am b/bat/Makefile.am
+index 842ae6b..f0dc5ab 100644
+--- a/bat/Makefile.am
++++ b/bat/Makefile.am
+@@ -13,7 +13,7 @@ bat_SOURCES = \
+
+ noinst_HEADERS = \
+ common.h \
+- signal.h \
++ bat-signal.h \
+ alsa.h \
+ convert.h \
+ analyze.h
+diff --git a/bat/alsa.c b/bat/alsa.c
+index 582c604..d31a633 100644
+--- a/bat/alsa.c
++++ b/bat/alsa.c
+@@ -27,7 +27,7 @@
+
+ #include "common.h"
+ #include "alsa.h"
+-#include "signal.h"
++#include "bat-signal.h"
+
+ struct pcm_container {
+ snd_pcm_t *handle;
+diff --git a/bat/bat-signal.h b/bat/bat-signal.h
+new file mode 100644
+index 0000000..a295517
+--- /dev/null
++++ b/bat/bat-signal.h
+@@ -0,0 +1,30 @@
++/*
++ * Copyright (C) 2015 Caleb Crome
++ * Copyright (C) 2013-2015 Intel Corporation
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ */
++
++/*
++ * Here's a generic sine wave generator that will work indefinitely
++ * for any frequency.
++ *
++ * Note: the state & phasor are stored as doubles (and updated as
++ * doubles) because after a million samples the magnitude drifts a
++ * bit. If we really need floats, it can be done with periodic
++ * renormalization of the state_real+state_imag magnitudes.
++ */
++
++int sin_generator_init(struct sin_generator *, float, float, float);
++float sin_generator_next_sample(struct sin_generator *);
++void sin_generator_vfill(struct sin_generator *, float *, int);
++int generate_sine_wave(struct bat *, int, void *);
+diff --git a/bat/signal.h b/bat/signal.h
+deleted file mode 100644
+index a295517..0000000
+--- a/bat/signal.h
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+- * Copyright (C) 2015 Caleb Crome
+- * Copyright (C) 2013-2015 Intel Corporation
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- */
+-
+-/*
+- * Here's a generic sine wave generator that will work indefinitely
+- * for any frequency.
+- *
+- * Note: the state & phasor are stored as doubles (and updated as
+- * doubles) because after a million samples the magnitude drifts a
+- * bit. If we really need floats, it can be done with periodic
+- * renormalization of the state_real+state_imag magnitudes.
+- */
+-
+-int sin_generator_init(struct sin_generator *, float, float, float);
+-float sin_generator_next_sample(struct sin_generator *);
+-void sin_generator_vfill(struct sin_generator *, float *, int);
+-int generate_sine_wave(struct bat *, int, void *);
+--
+2.4.10
+
diff --git a/package/alsa-utils/0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch b/package/alsa-utils/0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch
new file mode 100644
index 0000000..68015cf
--- /dev/null
+++ b/package/alsa-utils/0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch
@@ -0,0 +1,61 @@
+bat: Don't pass incompatible function pointers to
+
+Patch backported from upstream:
+
+ http://git.alsa-project.org/?p=alsa-utils.git;a=commit;h=ed0cce1b6061aade0077982cb5d22fa68ddffd2f
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+From ed0cce1b6061aade0077982cb5d22fa68ddffd2f Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 9 Nov 2015 14:09:50 +0100
+Subject: [PATCH 2/2] bat: Don't pass incompatible function pointers to
+ pthread_cleanup_push()
+
+pthread_cleanup_push() takes a function pointer for void (void *).
+Although it may work in most cases, we shouldn't pass an incompatible
+function pointer there, as some old gcc complains:
+ alsa.c:560: warning: initialization from incompatible pointer type
+ alsa.c:562: warning: initialization from incompatible pointer type
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ bat/alsa.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/bat/alsa.c b/bat/alsa.c
+index d31a633..5eaa25b 100644
+--- a/bat/alsa.c
++++ b/bat/alsa.c
+@@ -505,6 +505,16 @@ static int read_from_pcm_loop(FILE *fp, int count,
+ return 0;
+ }
+
++static void pcm_cleanup(void *p)
++{
++ snd_pcm_close(p);
++}
++
++static void file_cleanup(void *p)
++{
++ fclose(p);
++}
++
+ /**
+ * Record
+ */
+@@ -557,9 +567,9 @@ void *record_alsa(struct bat *bat)
+
+ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+ pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+- pthread_cleanup_push(snd_pcm_close, sndpcm.handle);
++ pthread_cleanup_push(pcm_cleanup, sndpcm.handle);
+ pthread_cleanup_push(free, sndpcm.buffer);
+- pthread_cleanup_push(fclose, fp);
++ pthread_cleanup_push(file_cleanup, fp);
+
+ err = write_wav_header(fp, &wav, bat);
+ if (err != 0) {
+--
+2.4.10
+
--
2.4.10
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] alsa-utils: fix conflics with pthread.h
2015-12-08 20:59 ` Peter Korsgaard
2015-12-09 10:44 ` [Buildroot] [PATCH v2] " Vicente Olivert Riera
@ 2015-12-09 10:47 ` Vicente Olivert Riera
1 sibling, 0 replies; 5+ messages in thread
From: Vicente Olivert Riera @ 2015-12-09 10:47 UTC (permalink / raw)
To: buildroot
Hello Peter,
On 08/12/15 20:59, Peter Korsgaard wrote:
>> +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?
Done:
http://patchwork.ozlabs.org/patch/554448/
Regards,
Vincent.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] alsa-utils: fix conflics with pthread.h
2015-12-09 10:44 ` [Buildroot] [PATCH v2] " Vicente Olivert Riera
@ 2015-12-10 22:06 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2015-12-10 22:06 UTC (permalink / raw)
To: buildroot
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
> Backport two upstream patches to fix a build failure due to conflicts
> with pthread.h:
> +++ b/package/alsa-utils/0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch
> @@ -0,0 +1,61 @@
> +bat: Don't pass incompatible function pointers to
The end of that line somehow got stripped.
Committed with that fixed, thanks.
--
Venlig hilsen,
Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-12-10 22:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-07 15:23 [Buildroot] [PATCH] alsa-utils: fix conflics with pthread.h Vicente Olivert Riera
2015-12-08 20:59 ` Peter Korsgaard
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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.