diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2014-05-01 06:17:28 +0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-05-22 11:17:48 +0200 |
| commit | 78271772e3dcb09fe7f9a249e896acd925e7fc79 (patch) | |
| tree | 2cb3411472c142c0d2116b38204ecd194afe8200 | |
| parent | c3e412f72e072fe1fd82fb746ad6239eeac0e3d4 (diff) | |
| download | buildroot-78271772e3dcb09fe7f9a249e896acd925e7fc79.tar.gz buildroot-78271772e3dcb09fe7f9a249e896acd925e7fc79.zip | |
flite: fix static linking against alsa
Fixes:
http://autobuild.buildroot.net/results/3ff/3ff2217a4fccbddbdb2bc8ade68c88fc52848d36/
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/flite/flite-0002-fix-alsa-static.patch | 19 | ||||
| -rw-r--r-- | package/flite/flite.mk | 3 |
2 files changed, 22 insertions, 0 deletions
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 0000000000..7ed4899cc4 --- /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 08d2ce1622..38aaebf517 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. |
