From be3252fe01f39f8ac21d611861bd0c5dda58b09f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 22:52:49 +0200 Subject: [PATCH] package/openocd: fix build with libgpiod2 openocd is not compatible with libgpiod2 resulting in the following build failure since the addition of libgpiod2 in commit 57391fad2e619395340b81957ddceab1b1df2e20: src/jtag/drivers/linuxgpiod.c: In function 'helper_get_line': src/jtag/drivers/linuxgpiod.c:283:19: error: 'GPIOD_LINE_REQUEST_DIRECTION_INPUT' undeclared (first use in this function); did you mean 'GPIOD_LINE_DIRECTION_INPUT'? 283 | int dir = GPIOD_LINE_REQUEST_DIRECTION_INPUT, flags = 0, val = 0, retval; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | GPIOD_LINE_DIRECTION_INPUT Fixes: 57391fad2e619395340b81957ddceab1b1df2e20 - http://autobuild.buildroot.org/results/7195e8b76350f26ab3b963702d88b254512e6928 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/openocd/openocd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 78c6e10c58..b24d1eacf0 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -56,8 +56,14 @@ OPENOCD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBUSB),libusb) \ $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ $(if $(BR2_PACKAGE_LIBHID),libhid) \ - $(if $(BR2_PACKAGE_HIDAPI),hidapi) \ - $(if $(BR2_PACKAGE_LIBGPIOD),libgpiod) + $(if $(BR2_PACKAGE_HIDAPI),hidapi) + +ifeq ($(BR2_PACKAGE_LIBGPIOD),y) +OPENOCD_DEPENDENCIES += libgpiod +OPENOCD_CONF_OPTS += --enable-linuxgpiod +else +OPENOCD_CONF_OPTS += --disable-linuxgpiod +endif # Adapters OPENOCD_CONF_OPTS += \