diff options
| author | Richard Leitner <richard.leitner@skidata.com> | 2020-09-11 10:58:17 +0200 |
|---|---|---|
| committer | Richard Leitner <richard.leitner@skidata.com> | 2020-10-22 08:42:46 +0200 |
| commit | 488e7f9e191790b54adeb3f4b968ae27d50c9f33 (patch) | |
| tree | be91676a39c9c2c698a687bad4c232814a218a2d | |
| parent | dbd9b1f65000d02e2e3eea520f8a1e709468aadc (diff) | |
| download | meta-java-488e7f9e191790b54adeb3f4b968ae27d50c9f33.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.inc | 5 |
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): | |||
| 111 | if not option_headless and not with_cups: | 111 | if not option_headless and not with_cups: |
| 112 | option_headless = True | 112 | option_headless = True |
| 113 | 113 | ||
| 114 | if not option_soundless and not with_alsa: | 114 | if not option_soundless and not with_pulseaudio and not with_alsa: |
| 115 | option_soundless = True | ||
| 116 | |||
| 117 | if not option_soundless and not with_pulseaudio: | ||
| 118 | option_soundless = True | 115 | option_soundless = True |
| 119 | 116 | ||
| 120 | options = {'make': [], 'cpp': [], 'env': [], 'configure': ["--disable-ccache"] } | 117 | options = {'make': [], 'cpp': [], 'env': [], 'configure': ["--disable-ccache"] } |