[OE-core] [PATCH 1/2] meta: unset REQUIRED_DISTRO_FEATURES for libx11 and its dependents

liu.ming50 at gmail.com liu.ming50 at gmail.com
Thu May 2 19:40:54 UTC 2019


From: Ming Liu <liu.ming50 at gmail.com>

This is to allow libx11 to be built without the requirement for x11
distro feature.

The reason for doing this is because the libx11 is providing
libx11-locale package and that is being depended by libxkbcommon at
runtime, and libxkbcommon is not a X11 specific recipe, it should be
be able to be depended by other non-X11 recipes like weston or qtbase.

Signed-off-by: Ming Liu <liu.ming50 at gmail.com>
---
 meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb   | 2 ++
 meta/recipes-graphics/xorg-lib/libxau_1.0.9.bb   | 2 ++
 meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb  | 4 ----
 meta/recipes-graphics/xorg-lib/libxdmcp_1.1.3.bb | 2 ++
 meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb   | 2 ++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
index 6141f57..5c96e9a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
@@ -10,4 +10,6 @@ do_configure_append () {
     sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile
 }
 
+REQUIRED_DISTRO_FEATURES = ""
+
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libxau_1.0.9.bb b/meta/recipes-graphics/xorg-lib/libxau_1.0.9.bb
index dcfc666..c4e5078 100644
--- a/meta/recipes-graphics/xorg-lib/libxau_1.0.9.bb
+++ b/meta/recipes-graphics/xorg-lib/libxau_1.0.9.bb
@@ -18,6 +18,8 @@ PE = "1"
 
 XORG_PN = "libXau"
 
+REQUIRED_DISTRO_FEATURES = ""
+
 BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI[md5sum] = "c5f16288f2da9f071b29111d68797480"
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb
index 84303e6..6f9e700 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb
@@ -28,10 +28,6 @@ FILES_${PN} = "${libdir}/libxcb.so.*"
 
 inherit autotools pkgconfig distro_features_check
 
-# The libxau and others requires x11 in DISTRO_FEATURES
-REQUIRED_DISTRO_FEATURES = "x11"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-
 export PYTHON = "python3"
 
 python populate_packages_prepend () {
diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.3.bb
index d43a146..254e015 100644
--- a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.3.bb
@@ -20,6 +20,8 @@ PE = "1"
 
 XORG_PN = "libXdmcp"
 
+REQUIRED_DISTRO_FEATURES = ""
+
 BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI[md5sum] = "115c5c12ecce0e749cd91d999a5fd160"
diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb
index 5bf134b..27851b2 100644
--- a/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb
+++ b/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb
@@ -20,6 +20,8 @@ RDEPENDS_${PN}-dev = ""
 
 inherit gettext
 
+REQUIRED_DISTRO_FEATURES = ""
+
 BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI[md5sum] = "ce2fb8100c6647ee81451ebe388b17ad"
-- 
2.7.4



More information about the Openembedded-core mailing list