diff mbox series

[meta-oe,v2] gnuplot: add x11 PACKAGECONFIG

Message ID 20250228130451.52524-1-paul.leguendekerneizon@savoirfairelinux.com
State Accepted
Headers show
Series [meta-oe,v2] gnuplot: add x11 PACKAGECONFIG | expand

Commit Message

Paul Le Guen de Kerneizon Feb. 28, 2025, 1:04 p.m. UTC 
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. `features_check` inherit is removed as
any of the functionalities of this class is now used.

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

--
2.34.1
diff mbox series

Patch

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..7508d37fed 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
+inherit autotools 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 \
@@ -38,10 +37,11 @@  do_install:class-native() {
     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] = "--with-x,--without-x,virtual/libx11"

 EXTRA_OECONF = " \
     --with-readline=${STAGING_LIBDIR}/.. \