new file mode 100644
@@ -0,0 +1,33 @@
+From 8293f0b8a329beed542f5c8a2efa4641759fccf4 Mon Sep 17 00:00:00 2001
+From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+Date: Tue, 11 Jun 2024 10:34:14 +0200
+Subject: [PATCH] bindings: cxx: disable tests
+
+Meta-openembedded is moving to catch2 v3 which will make the C++ tests
+incompatible with the testing library. As this is an older version of
+the project, just disable C++ tests entirely.
+
+Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+---
+Upstream-Status: Inappropriate [upstream continues to use Catch2 v2]
+
+ bindings/cxx/Makefile.am | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/bindings/cxx/Makefile.am b/bindings/cxx/Makefile.am
+index 5c40ceb..d901836 100644
+--- a/bindings/cxx/Makefile.am
++++ b/bindings/cxx/Makefile.am
+@@ -19,9 +19,3 @@ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libgpiodcxx.pc
+
+ SUBDIRS = . examples
+-
+-if WITH_TESTS
+-
+-SUBDIRS += tests
+-
+-endif
+--
+2.40.1
+
@@ -1,6 +1,6 @@
#!/bin/sh
-testbins="gpiod-test gpio-tools-test gpiod-cxx-test gpiod_py_test.py"
+testbins="gpiod-test gpio-tools-test gpiod_py_test.py"
ptestdir=$(dirname "$(readlink -f "$0")")
cd $ptestdir/tests
@@ -52,9 +52,5 @@ do_install_ptest() {
for tool in ${FILES:${PN}-tools}; do
install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/
done
-
- if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then
- install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/
- fi
}
@@ -3,6 +3,8 @@ require libgpiod.inc
LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de"
+SRC_URI += "file://0001-bindings-cxx-disable-tests.patch"
+
SRC_URI[sha256sum] = "ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:"
@@ -26,6 +26,7 @@ RDEPENDS:${PN}-ptest += " \
RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs"
do_install_ptest:append() {
+ install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/
install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/
install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h
}