* [Buildroot] [PATCH 1/2] flite: depend on alsa-lib when available @ 2014-05-01 3:17 Baruch Siach 2014-05-01 3:17 ` [Buildroot] [PATCH 2/2] flite: fix static linking against alsa Baruch Siach 2014-05-03 20:32 ` [Buildroot] [PATCH 1/2] flite: depend on alsa-lib when available Peter Korsgaard 0 siblings, 2 replies; 8+ messages in thread From: Baruch Siach @ 2014-05-01 3:17 UTC (permalink / raw) To: buildroot The flite configure script detects the availability of alsa-lib. Add alsa-lib to flite dependencies to make sure alsa-lib is always detected when available. Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- package/flite/flite.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/flite/flite.mk b/package/flite/flite.mk index 7511b87731e7..08d2ce1622f9 100644 --- a/package/flite/flite.mk +++ b/package/flite/flite.mk @@ -38,4 +38,11 @@ define FLITE_EXTRACT_CMDS $(RM) -rf $(BUILD_DIR)/$(subst .tar.bz2,,$(FLITE_SOURCE)) endef +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) +FLITE_DEPENDENCIES += alsa-lib +FLITE_CONF_OPT += --with-audio=alsa +else +FLITE_CONF_OPT += --with-audio=oss +endif + $(eval $(autotools-package)) -- 1.9.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] flite: fix static linking against alsa 2014-05-01 3:17 [Buildroot] [PATCH 1/2] flite: depend on alsa-lib when available Baruch Siach @ 2014-05-01 3:17 ` Baruch Siach 2014-05-02 21:47 ` Arnout Vandecappelle 2014-05-22 7:01 ` Baruch Siach 2014-05-03 20:32 ` [Buildroot] [PATCH 1/2] flite: depend on alsa-lib when available Peter Korsgaard 1 sibling, 2 replies; 8+ messages in thread From: Baruch Siach @ 2014-05-01 3:17 UTC (permalink / raw) To: buildroot 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` ++ 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. -- 1.9.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] flite: fix static linking against alsa 2014-05-01 3:17 ` [Buildroot] [PATCH 2/2] flite: fix static linking against alsa Baruch Siach @ 2014-05-02 21:47 ` Arnout Vandecappelle 2014-05-02 22:00 ` Arnout Vandecappelle 2014-05-04 11:04 ` Baruch Siach 2014-05-22 7:01 ` Baruch Siach 1 sibling, 2 replies; 8+ messages in thread From: Arnout Vandecappelle @ 2014-05-02 21:47 UTC (permalink / raw) To: buildroot 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 arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] flite: fix static linking against alsa 2014-05-02 21:47 ` Arnout Vandecappelle @ 2014-05-02 22:00 ` Arnout Vandecappelle 2014-05-04 11:04 ` Baruch Siach 1 sibling, 0 replies; 8+ messages in thread From: Arnout Vandecappelle @ 2014-05-02 22:00 UTC (permalink / raw) To: buildroot 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. >> > > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] flite: fix static linking against alsa 2014-05-02 21:47 ` Arnout Vandecappelle 2014-05-02 22:00 ` Arnout Vandecappelle @ 2014-05-04 11:04 ` Baruch Siach 1 sibling, 0 replies; 8+ messages in thread From: Baruch Siach @ 2014-05-04 11:04 UTC (permalink / raw) To: buildroot 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. -- http://baruch.siach.name/blog/ ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il - ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] flite: fix static linking against alsa 2014-05-01 3:17 ` [Buildroot] [PATCH 2/2] flite: fix static linking against alsa Baruch Siach 2014-05-02 21:47 ` Arnout Vandecappelle @ 2014-05-22 7:01 ` Baruch Siach 2014-05-22 9:54 ` Peter Korsgaard 1 sibling, 1 reply; 8+ messages in thread From: Baruch Siach @ 2014-05-22 7:01 UTC (permalink / raw) To: buildroot 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. -- http://baruch.siach.name/blog/ ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il - ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] flite: fix static linking against alsa 2014-05-22 7:01 ` Baruch Siach @ 2014-05-22 9:54 ` Peter Korsgaard 0 siblings, 0 replies; 8+ messages in thread From: Peter Korsgaard @ 2014-05-22 9:54 UTC (permalink / raw) To: buildroot >>>>> "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. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] flite: depend on alsa-lib when available 2014-05-01 3:17 [Buildroot] [PATCH 1/2] flite: depend on alsa-lib when available Baruch Siach 2014-05-01 3:17 ` [Buildroot] [PATCH 2/2] flite: fix static linking against alsa Baruch Siach @ 2014-05-03 20:32 ` Peter Korsgaard 1 sibling, 0 replies; 8+ messages in thread From: Peter Korsgaard @ 2014-05-03 20:32 UTC (permalink / raw) To: buildroot >>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes: > The flite configure script detects the availability of alsa-lib. Add alsa-lib > to flite dependencies to make sure alsa-lib is always detected when > available. > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-05-22 9:54 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-01 3:17 [Buildroot] [PATCH 1/2] flite: depend on alsa-lib when available Baruch Siach 2014-05-01 3:17 ` [Buildroot] [PATCH 2/2] flite: fix static linking against alsa Baruch Siach 2014-05-02 21:47 ` Arnout Vandecappelle 2014-05-02 22:00 ` Arnout Vandecappelle 2014-05-04 11:04 ` Baruch Siach 2014-05-22 7:01 ` Baruch Siach 2014-05-22 9:54 ` Peter Korsgaard 2014-05-03 20:32 ` [Buildroot] [PATCH 1/2] flite: depend on alsa-lib when available Peter Korsgaard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox