aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-09-11 10:58:17 +0200
committerRichard Leitner <richard.leitner@skidata.com>2020-10-22 08:42:46 +0200
commit488e7f9e191790b54adeb3f4b968ae27d50c9f33 (patch)
treebe91676a39c9c2c698a687bad4c232814a218a2d /recipes-core/openjdk
parentdbd9b1f65000d02e2e3eea520f8a1e709468aadc (diff)
downloadmeta-java-488e7f9e191790b54adeb3f4b968ae27d50c9f33.tar.gz
meta-java-488e7f9e191790b54adeb3f4b968ae27d50c9f33.tar.bz2
meta-java-488e7f9e191790b54adeb3f4b968ae27d50c9f33.zip
openjdk-8-common: fix soundless evaluation
If only alsa and not pulseaudio was in PACKAGECONFIG soundless was configured. This is incorrect for obvious reasons, therefore set soundless only if alsa and pulseaudio isn't set. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index 04acc59..70585a6 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -111,10 +111,7 @@ def package_config_option_cleanup(d):
if not option_headless and not with_cups:
option_headless = True
- if not option_soundless and not with_alsa:
- option_soundless = True
-
- if not option_soundless and not with_pulseaudio:
+ if not option_soundless and not with_pulseaudio and not with_alsa:
option_soundless = True
options = {'make': [], 'cpp': [], 'env': [], 'configure': ["--disable-ccache"] }