summaryrefslogtreecommitdiffstats
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-09-11 10:58:17 +0200
commitc8892a953a64f354575e66a68742c1b2a138f3a7 (patch)
tree277f069619ec76e362b04ddee67d3a88fb574636
parent0ebda67a3052240f92d60bfcd59b711428441291 (diff)
downloadmeta-java-c8892a953a64f354575e66a68742c1b2a138f3a7.tar.gz
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>
-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 c78bb2a..d69fb46 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -96,10 +96,7 @@ def package_config_option_cleanup(d):
96 if not option_headless and not with_cups: 96 if not option_headless and not with_cups:
97 option_headless = True 97 option_headless = True
98 98
99 if not option_soundless and not with_alsa: 99 if not option_soundless and not with_pulseaudio and not with_alsa:
100 option_soundless = True
101
102 if not option_soundless and not with_pulseaudio:
103 option_soundless = True 100 option_soundless = True
104 101
105 options = {'make': [], 'cpp': [], 'env': [], 'configure': ["--disable-ccache"] } 102 options = {'make': [], 'cpp': [], 'env': [], 'configure': ["--disable-ccache"] }