Currently, gnuplot recipe requires the x11 distro feature to be built.
However, X11 is not needed for running gnuplot as long as we don't use
a gnuplot X11 terminal.
This commit adds the x11 package config used to make the need of x11
distro feature optional to build gnuplot.

Signed-off-by: Paul Le Guen de Kerneizon 
<paul.leguendekernei...@savoirfairelinux.com>
---
 meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb 
b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
index fe5e5c067d..ba79534cb9 100644
--- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
@@ -5,11 +5,10 @@ HOMEPAGE = "http://www.gnuplot.info/";
 SECTION = "console/scientific"
 LICENSE = "gnuplot"
 LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f"
-DEPENDS = "${BPN}-native virtual/libx11 gd readline"
+DEPENDS = "${BPN}-native gd readline"

 inherit autotools features_check pkgconfig
 # depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"

 SRC_URI = 
"${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz;name=archive \
            http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
@@ -37,11 +36,11 @@ do_install:class-native() {
        install ${B}/docs/*doc* ${D}${bindir}
     rm ${D}${bindir}/*.o
 }
-
-PACKAGECONFIG ??= "cairo"
+PACKAGECONFIG ??= "cairo ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango"
 PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua"
 PACKAGECONFIG[qt5] = "--with-qt 
--with-qt5nativesysroot=${STAGING_DIR_NATIVE},--without-qt,qtbase-native qtbase 
qtsvg qttools-native"
+PACKAGECONFIG[x11] = ",,virtual/libx11"

 EXTRA_OECONF = " \
     --with-readline=${STAGING_LIBDIR}/.. \
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#115692): 
https://lists.openembedded.org/g/openembedded-devel/message/115692
Mute This Topic: https://lists.openembedded.org/mt/111417234/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to