Skip to contentSkip to conversation

classpath: Use an include file for x11 feature check

PATCH In review Andrei Gherzan 1 participant 4 messages Aug 17, 2022 – Aug 21, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 classpath: Use an include file for x11 feature check

From: Andrei Gherzan <[email protected]>

This will make it easier to maintain reflecting the same distro check on packages depending on classpath (in the dependency chain).

---
 recipes-core/classpath/classpath-features-check.inc | 6 ++++++
 recipes-core/classpath/classpath_0.99.bb            | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 recipes-core/classpath/classpath-features-check.inc
recipes-core/classpath/classpath-features-check.inc new file +6 -0
new file mode 100644
index 0000000..c238fc3
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "x11"
recipes-core/classpath/classpath_0.99.bb +1 -3
index 5b9d904..f18ad1d 100644
@@ -1,8 +1,6 @@
 require classpath.inc
 
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "x11"
+include classpath-features-check.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=92acc79f1f429143f4624d07b253702a"
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/3 libmatthew: Include features check from classpath

From: Andrei Gherzan <[email protected]>

classpath is a dependency of this package that also has a required distro feature on x11. Without having the same feature check here, a world build would fail when x11 is not enabled. Reflecting the same feature check in this recipe, makes sure that world will skip it as well.

---
 recipes-core/libmatthew/libmatthew.inc | 3 +++
 1 file changed, 3 insertions(+)
recipes-core/libmatthew/libmatthew.inc +3 -0
index b000387..4157d51 100644
@@ -5,11 +5,14 @@ SECTION = "libs"
 LICENSE = "MIT"
 DEPENDS = "virtual/java-native classpath-native classpath"
 
+
 S = "${WORKDIR}/libmatthew-java-${PV}"
 
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
 inherit java-library
 
+include recipes-core/classpath/classpath-features-check.inc
+
 # Some internal version numbers which change from time to time.
 # Allowing to override them makes this include file more
 # versatile.
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/3 dbus-java: Include features check from classpath

In reply to Andrei Gherzan

From: Andrei Gherzan <[email protected]>

classpath is an indirect dependency of this package that also has a required distro feature on x11. Without having the same feature check here, a world build would fail when x11 is not enabled. Reflecting the same feature check in this recipe, makes sure that world will skip it as well.

---
 recipes-extended/dbus/dbus-java_2.7.bb | 2 ++
 1 file changed, 2 insertions(+)
recipes-extended/dbus/dbus-java_2.7.bb +2 -0
index ca7652a..0e5ae92 100644
@@ -25,6 +25,8 @@ S = "${WORKDIR}/dbus-java-${PV}"
 
 inherit java-library
 
+include recipes-core/classpath/classpath-features-check.inc
+
 # jamvm-native unfortunately contains non-generificed java/lang/reflect classes
 # which are accessed in this package. Work around this by setting the bootclasspath
 # explicitly.
Signature · 1 line
2.25.1
#3 lore raw
In reply to Andrei Gherzan
Quoted 42 lines · Andrei Gherzan

From: Andrei Gherzan <[email protected]>

This will make it easier to maintain reflecting the same distro check on packages depending on classpath (in the dependency chain).

---
 recipes-core/classpath/classpath-features-check.inc | 6 ++++++
 recipes-core/classpath/classpath_0.99.bb            | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 recipes-core/classpath/classpath-features-check.inc
recipes-core/classpath/classpath-features-check.inc new file +6 -0
new file mode 100644
index 0000000..c238fc3
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "x11"
recipes-core/classpath/classpath_0.99.bb +1 -3
index 5b9d904..f18ad1d 100644
@@ -1,8 +1,6 @@
 require classpath.inc
 
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "x11"
+include classpath-features-check.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=92acc79f1f429143f4624d07b253702a"
 
Signature · 1 line
2.25.1

Friendly reminder on this set.

Andrei