summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-09-22 19:37:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-24 11:30:34 +0100
commitb5b0fc2b73209e4d107d9351ec7d030997ca5ec5 (patch)
tree1119eb6a164ffb1c0608bba55538b9002dbe9a40
parent82a99a4cee4c63bafe6335897f2adccb5fe2a7c7 (diff)
downloadpoky-b5b0fc2b73209e4d107d9351ec7d030997ca5ec5.tar.gz
pulseaudio: Ensure openssl is disabled
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. (From OE-Core rev: 1cdcd754651f8d519ac8e4ba0d241d784e2a0090) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc1
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 14e90a213c..753b013cd4 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -37,6 +37,7 @@ EXTRA_OECONF = "\
37 --disable-orc \ 37 --disable-orc \
38 --enable-tcpwrap=no \ 38 --enable-tcpwrap=no \
39 --with-access-group=audio \ 39 --with-access-group=audio \
40 --disable-openssl \
40" 41"
41 42
42PARALLEL_MAKE = "" 43PARALLEL_MAKE = ""
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
index 2f3728f919..947aa6ded6 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
@@ -1,6 +1,6 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5DEPENDS += "libjson gdbm speex libxml-parser-perl-native" 5DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
6 6