Skip to contentSkip to conversation

libinput: Add packageconfig for tests

PATCH New Joshua Watt 1 participant 1 message Dec 18, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libinput: Add packageconfig for tests

Add packageconfig to control if tests are installed or not. Doing this allows the libcheck dependency to be optional. The packageconfig defaults to having tests enabled when PTEST_ENABLED == 1 to match the previous behavior

---
 meta/recipes-graphics/wayland/libinput_1.24.0.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-graphics/wayland/libinput_1.24.0.bb +3 -3
index 49a1da2b22c..26ab1adaea0 100644
@@ -10,7 +10,7 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bab4ac7dc1c10bc0fb037dc76c46ef8a"
 
-DEPENDS = "libevdev udev mtdev libcheck"
+DEPENDS = "libevdev udev mtdev"
 
 SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=main \
            file://run-ptest \
@@ -30,15 +30,15 @@ do_configure:append() {
     fi
 }
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
 PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom"
 PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3"
+PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false,libcheck"
 
 UDEVDIR = "`pkg-config --variable=udevdir udev`"
 
 EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \
                   -Ddocumentation=false \
-                  ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true -Dinstall-tests=true', '-Dtests=false -Dinstall-tests=false', d)} \
                   -Dzshcompletiondir=no"
 
 # package name changed in 1.8.1 upgrade: make sure package upgrades work
Signature · 1 line
2.34.1