All of lore.kernel.org
 help / color / mirror / Atom feed
From: Baruch Siach <baruch@tkos.co.il>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] flite: fix static linking against alsa
Date: Thu, 22 May 2014 10:01:56 +0300	[thread overview]
Message-ID: <20140522070155.GD4986@tarshish> (raw)
In-Reply-To: <9de46632bda63213596b0df8c278edf32a232daa.1398914248.git.baruch@tkos.co.il>

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 -

  parent reply	other threads:[~2014-05-22  7:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
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

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=20140522070155.GD4986@tarshish \
    --to=baruch@tkos.co.il \
    --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 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.