| Submitter | Phil Blundell |
|---|---|
| Date | Sept. 22, 2012, 6:37 p.m. |
| Message ID | <1348339024.4444.228.camel@x121e.pbcl.net> |
| Download | mbox | patch |
| Permalink | /patch/37073/ |
| State | Accepted |
| Commit | 1cdcd754651f8d519ac8e4ba0d241d784e2a0090 |
| Headers | show |
Comments
On Sat, 2012-09-22 at 19:37 +0100, Phil Blundell wrote: > We don't DEPEND on openssl but configure will try to use it if > pkg-config thinks it might be installed. This can lead to failing > and/or nondeterministic builds, so let's force it off. > > Signed-off-by: Phil Blundell <pb@pbcl.net> > --- > meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 1 + > .../pulseaudio/pulseaudio_2.1.bb | 2 +- > 2 files changed, 2 insertions(+), 1 deletions(-) Merged to master, thanks. Richard
Patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 14e90a2..753b013 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -37,6 +37,7 @@ EXTRA_OECONF = "\ --disable-orc \ --enable-tcpwrap=no \ --with-access-group=audio \ + --disable-openssl \ " PARALLEL_MAKE = "" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb index 2f3728f..947aa6d 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r4" +PR = "r5" DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
We don't DEPEND on openssl but configure will try to use it if pkg-config thinks it might be installed. This can lead to failing and/or nondeterministic builds, so let's force it off. Signed-off-by: Phil Blundell <pb@pbcl.net> --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 1 + .../pulseaudio/pulseaudio_2.1.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)