[meta-java,3/3] openjdk-8-common: fix soundless evaluation

Submitted by Richard Leitner on Sept. 11, 2020, 10:21 a.m. | Patch ID: 176415

Details

Message ID 20200911102116.597001-3-richard.leitner@skidata.com
State Master Next
Delegated to: Richard Leitner
Headers show

Commit Message

Richard Leitner Sept. 11, 2020, 10:21 a.m.
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>
---
 recipes-core/openjdk/openjdk-8-common.inc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Patch hide | download patch | download mbox

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"] }