Patchwork [2/2] flite: fix static linking against alsa

login
register
mail settings
Submitter Baruch Siach
Date May 1, 2014, 3:17 a.m.
Message ID <9de46632bda63213596b0df8c278edf32a232daa.1398914248.git.baruch@tkos.co.il>
Download mbox | patch
Permalink /patch/344396/
State Accepted
Commit 78271772e3dcb09fe7f9a249e896acd925e7fc79
Headers show

Comments

Baruch Siach - May 1, 2014, 3:17 a.m.
Fixes:
http://autobuild.buildroot.net/results/3ff/3ff2217a4fccbddbdb2bc8ade68c88fc52848d36/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/flite/flite-0002-fix-alsa-static.patch | 19 +++++++++++++++++++
 package/flite/flite.mk                         |  3 +++
 2 files changed, 22 insertions(+)
 create mode 100644 package/flite/flite-0002-fix-alsa-static.patch
Arnout Vandecappelle - May 2, 2014, 9:47 p.m.
On 01/05/14 05:17, Baruch Siach wrote:
> Fixes:
> http://autobuild.buildroot.net/results/3ff/3ff2217a4fccbddbdb2bc8ade68c88fc52848d36/
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/flite/flite-0002-fix-alsa-static.patch | 19 +++++++++++++++++++
>  package/flite/flite.mk                         |  3 +++
>  2 files changed, 22 insertions(+)
>  create mode 100644 package/flite/flite-0002-fix-alsa-static.patch
> 
> diff --git a/package/flite/flite-0002-fix-alsa-static.patch b/package/flite/flite-0002-fix-alsa-static.patch
> new file mode 100644
> index 000000000000..7ed4899cc4f7
> --- /dev/null
> +++ b/package/flite/flite-0002-fix-alsa-static.patch
> @@ -0,0 +1,19 @@
> +Use pkg-config to determine alsa link flags. This fixes static linking.
> +
> +Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> +
> +diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in
> +--- flite-1.4-release.orig/configure.in	2009-08-14 23:46:38.000000000 +0300
> ++++ flite-1.4-release/configure.in	2014-04-30 18:52:33.253297236 +0300
> +@@ -275,7 +275,10 @@
> +                 #endif],
> +               [AUDIODRIVER="alsa"
> + 	       AUDIODEFS=-DCST_AUDIO_ALSA
> +-               AUDIOLIBS=-lasound])
> ++               AUDIOLIBS=`pkg-config --libs alsa`
> ++               if test "$shared" = false; then
> ++                   AUDIOLIBS=`pkg-config --libs --static alsa`

 In the light of Thomas's wish of having a more fundamental solution for all
these static link issues: how about adding --static to the pkg-config wrapper?


 Regards,
 Arnout

> ++               fi])
> + AC_CHECK_HEADER(mmsystem.h,
> + 	      [AUDIODRIVER="wince"
> + 	       AUDIODEFS=-DCST_AUDIO_WINCE
> diff --git a/package/flite/flite.mk b/package/flite/flite.mk
> index 08d2ce1622f9..38aaebf51782 100644
> --- a/package/flite/flite.mk
> +++ b/package/flite/flite.mk
> @@ -11,6 +11,9 @@ FLITE_LICENSE = BSD-4c
>  FLITE_LICENSE_FILES = COPYING
>  
>  FLITE_INSTALL_STAGING = YES
> +# Patching configure.in
> +FLITE_AUTORECONF = YES
> +FLITE_DEPENDENCIES = host-pkgconf
>  
>  # Sadly, Flite does not support parallel build, especially when building its
>  # shared libraries.
>
Arnout Vandecappelle - May 2, 2014, 10 p.m.
On 02/05/14 23:47, Arnout Vandecappelle wrote:
> On 01/05/14 05:17, Baruch Siach wrote:
>> Fixes:
>> http://autobuild.buildroot.net/results/3ff/3ff2217a4fccbddbdb2bc8ade68c88fc52848d36/
>>
>> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>> ---
>>  package/flite/flite-0002-fix-alsa-static.patch | 19 +++++++++++++++++++
>>  package/flite/flite.mk                         |  3 +++
>>  2 files changed, 22 insertions(+)
>>  create mode 100644 package/flite/flite-0002-fix-alsa-static.patch
>>
>> diff --git a/package/flite/flite-0002-fix-alsa-static.patch b/package/flite/flite-0002-fix-alsa-static.patch
>> new file mode 100644
>> index 000000000000..7ed4899cc4f7
>> --- /dev/null
>> +++ b/package/flite/flite-0002-fix-alsa-static.patch
>> @@ -0,0 +1,19 @@
>> +Use pkg-config to determine alsa link flags. This fixes static linking.
>> +
>> +Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>> +
>> +diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in
>> +--- flite-1.4-release.orig/configure.in	2009-08-14 23:46:38.000000000 +0300
>> ++++ flite-1.4-release/configure.in	2014-04-30 18:52:33.253297236 +0300
>> +@@ -275,7 +275,10 @@
>> +                 #endif],
>> +               [AUDIODRIVER="alsa"
>> + 	       AUDIODEFS=-DCST_AUDIO_ALSA
>> +-               AUDIOLIBS=-lasound])
>> ++               AUDIOLIBS=`pkg-config --libs alsa`
>> ++               if test "$shared" = false; then
>> ++                   AUDIOLIBS=`pkg-config --libs --static alsa`
> 
>  In the light of Thomas's wish of having a more fundamental solution for all
> these static link issues: how about adding --static to the pkg-config wrapper?

 Ahem, looks like you had the same thought :-)

 Regards,
 Arnout

> 
> 
>  Regards,
>  Arnout
> 
>> ++               fi])
>> + AC_CHECK_HEADER(mmsystem.h,
>> + 	      [AUDIODRIVER="wince"
>> + 	       AUDIODEFS=-DCST_AUDIO_WINCE
>> diff --git a/package/flite/flite.mk b/package/flite/flite.mk
>> index 08d2ce1622f9..38aaebf51782 100644
>> --- a/package/flite/flite.mk
>> +++ b/package/flite/flite.mk
>> @@ -11,6 +11,9 @@ FLITE_LICENSE = BSD-4c
>>  FLITE_LICENSE_FILES = COPYING
>>  
>>  FLITE_INSTALL_STAGING = YES
>> +# Patching configure.in
>> +FLITE_AUTORECONF = YES
>> +FLITE_DEPENDENCIES = host-pkgconf
>>  
>>  # Sadly, Flite does not support parallel build, especially when building its
>>  # shared libraries.
>>
> 
>
Baruch Siach - May 4, 2014, 11:04 a.m.
Hi Arnout,

On Fri, May 02, 2014 at 11:47:29PM +0200, Arnout Vandecappelle wrote:
> On 01/05/14 05:17, Baruch Siach wrote:
> > Fixes:
> > http://autobuild.buildroot.net/results/3ff/3ff2217a4fccbddbdb2bc8ade68c88fc52848d36/
> > 
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> >  package/flite/flite-0002-fix-alsa-static.patch | 19 +++++++++++++++++++
> >  package/flite/flite.mk                         |  3 +++
> >  2 files changed, 22 insertions(+)
> >  create mode 100644 package/flite/flite-0002-fix-alsa-static.patch
> > 
> > diff --git a/package/flite/flite-0002-fix-alsa-static.patch b/package/flite/flite-0002-fix-alsa-static.patch
> > new file mode 100644
> > index 000000000000..7ed4899cc4f7
> > --- /dev/null
> > +++ b/package/flite/flite-0002-fix-alsa-static.patch
> > @@ -0,0 +1,19 @@
> > +Use pkg-config to determine alsa link flags. This fixes static linking.
> > +
> > +Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > +
> > +diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in
> > +--- flite-1.4-release.orig/configure.in	2009-08-14 23:46:38.000000000 +0300
> > ++++ flite-1.4-release/configure.in	2014-04-30 18:52:33.253297236 +0300
> > +@@ -275,7 +275,10 @@
> > +                 #endif],
> > +               [AUDIODRIVER="alsa"
> > + 	       AUDIODEFS=-DCST_AUDIO_ALSA
> > +-               AUDIOLIBS=-lasound])
> > ++               AUDIOLIBS=`pkg-config --libs alsa`
> > ++               if test "$shared" = false; then
> > ++                   AUDIOLIBS=`pkg-config --libs --static alsa`
> 
>  In the light of Thomas's wish of having a more fundamental solution for all
> these static link issues: how about adding --static to the pkg-config wrapper?

It is precisely because of Thomas wish for upstream-able solutions that I did 
it this way. Adding the pkg-config without the 'if' part is enough to solve 
the problem when combined with http://patchwork.ozlabs.org/patch/326741/, but 
it's otherwise mostly useless for upstream. That being said, I couldn't find 
any active upstream to send this patch to.

baruch

> > ++               fi])
> > + AC_CHECK_HEADER(mmsystem.h,
> > + 	      [AUDIODRIVER="wince"
> > + 	       AUDIODEFS=-DCST_AUDIO_WINCE
> > diff --git a/package/flite/flite.mk b/package/flite/flite.mk
> > index 08d2ce1622f9..38aaebf51782 100644
> > --- a/package/flite/flite.mk
> > +++ b/package/flite/flite.mk
> > @@ -11,6 +11,9 @@ FLITE_LICENSE = BSD-4c
> >  FLITE_LICENSE_FILES = COPYING
> >  
> >  FLITE_INSTALL_STAGING = YES
> > +# Patching configure.in
> > +FLITE_AUTORECONF = YES
> > +FLITE_DEPENDENCIES = host-pkgconf
> >  
> >  # Sadly, Flite does not support parallel build, especially when building its
> >  # shared libraries.
Baruch Siach - May 22, 2014, 7:01 a.m.
Hi Buildroot list,

On Thu, May 01, 2014 at 06:17:28AM +0300, Baruch Siach wrote:
> Fixes:
> http://autobuild.buildroot.net/results/3ff/3ff2217a4fccbddbdb2bc8ade68c88fc52848d36/

Ping.
I believe this should go in for 2014.05.

baruch

> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/flite/flite-0002-fix-alsa-static.patch | 19 +++++++++++++++++++
>  package/flite/flite.mk                         |  3 +++
>  2 files changed, 22 insertions(+)
>  create mode 100644 package/flite/flite-0002-fix-alsa-static.patch
> 
> diff --git a/package/flite/flite-0002-fix-alsa-static.patch b/package/flite/flite-0002-fix-alsa-static.patch
> new file mode 100644
> index 000000000000..7ed4899cc4f7
> --- /dev/null
> +++ b/package/flite/flite-0002-fix-alsa-static.patch
> @@ -0,0 +1,19 @@
> +Use pkg-config to determine alsa link flags. This fixes static linking.
> +
> +Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> +
> +diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in
> +--- flite-1.4-release.orig/configure.in	2009-08-14 23:46:38.000000000 +0300
> ++++ flite-1.4-release/configure.in	2014-04-30 18:52:33.253297236 +0300
> +@@ -275,7 +275,10 @@
> +                 #endif],
> +               [AUDIODRIVER="alsa"
> + 	       AUDIODEFS=-DCST_AUDIO_ALSA
> +-               AUDIOLIBS=-lasound])
> ++               AUDIOLIBS=`pkg-config --libs alsa`
> ++               if test "$shared" = false; then
> ++                   AUDIOLIBS=`pkg-config --libs --static alsa`
> ++               fi])
> + AC_CHECK_HEADER(mmsystem.h,
> + 	      [AUDIODRIVER="wince"
> + 	       AUDIODEFS=-DCST_AUDIO_WINCE
> diff --git a/package/flite/flite.mk b/package/flite/flite.mk
> index 08d2ce1622f9..38aaebf51782 100644
> --- a/package/flite/flite.mk
> +++ b/package/flite/flite.mk
> @@ -11,6 +11,9 @@ FLITE_LICENSE = BSD-4c
>  FLITE_LICENSE_FILES = COPYING
>  
>  FLITE_INSTALL_STAGING = YES
> +# Patching configure.in
> +FLITE_AUTORECONF = YES
> +FLITE_DEPENDENCIES = host-pkgconf
>  
>  # Sadly, Flite does not support parallel build, especially when building its
>  # shared libraries.
Peter Korsgaard - May 22, 2014, 9:54 a.m.
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > Hi Buildroot list,
 > On Thu, May 01, 2014 at 06:17:28AM +0300, Baruch Siach wrote:
 >> Fixes:
 >> http://autobuild.buildroot.net/results/3ff/3ff2217a4fccbddbdb2bc8ade68c88fc52848d36/

 > Ping.
 > I believe this should go in for 2014.05.

Committed, thanks.

Patch

diff --git a/package/flite/flite-0002-fix-alsa-static.patch b/package/flite/flite-0002-fix-alsa-static.patch
new file mode 100644
index 000000000000..7ed4899cc4f7
--- /dev/null
+++ b/package/flite/flite-0002-fix-alsa-static.patch
@@ -0,0 +1,19 @@ 
+Use pkg-config to determine alsa link flags. This fixes static linking.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+
+diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in
+--- flite-1.4-release.orig/configure.in	2009-08-14 23:46:38.000000000 +0300
++++ flite-1.4-release/configure.in	2014-04-30 18:52:33.253297236 +0300
+@@ -275,7 +275,10 @@
+                 #endif],
+               [AUDIODRIVER="alsa"
+ 	       AUDIODEFS=-DCST_AUDIO_ALSA
+-               AUDIOLIBS=-lasound])
++               AUDIOLIBS=`pkg-config --libs alsa`
++               if test "$shared" = false; then
++                   AUDIOLIBS=`pkg-config --libs --static alsa`
++               fi])
+ AC_CHECK_HEADER(mmsystem.h,
+ 	      [AUDIODRIVER="wince"
+ 	       AUDIODEFS=-DCST_AUDIO_WINCE
diff --git a/package/flite/flite.mk b/package/flite/flite.mk
index 08d2ce1622f9..38aaebf51782 100644
--- a/package/flite/flite.mk
+++ b/package/flite/flite.mk
@@ -11,6 +11,9 @@  FLITE_LICENSE = BSD-4c
 FLITE_LICENSE_FILES = COPYING
 
 FLITE_INSTALL_STAGING = YES
+# Patching configure.in
+FLITE_AUTORECONF = YES
+FLITE_DEPENDENCIES = host-pkgconf
 
 # Sadly, Flite does not support parallel build, especially when building its
 # shared libraries.