From: Karl Palsson <redacted>
Date: Fri, 20 Jan 2023 13:14:40 +0000 (+0000)
Subject: openocd: select new libjaylink
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=dd48483a60080ea5f3b83d5d4c71a9ac7b27043b;p=openwrt-packages.git

openocd: select new libjaylink

Without the +select, openocd's internal autoselection between internal
libjaylink and external libjaylink can result in linking against
external, without the depends declaration, leading to missing
depdendencies errors.

Hard depend on the external libjaylink, as that's the future direction
anyway.

Reported-by: Paul Fertser <redacted>
Signed-off-by: Karl Palsson <redacted>
---

diff --git a/utils/openocd/Makefile b/utils/openocd/Makefile
index 56b28e72e..0792db288 100644
--- a/utils/openocd/Makefile
+++ b/utils/openocd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openocd
 PKG_SOURCE_VERSION:=v0.12.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://git.code.sf.net/p/openocd/code
@@ -38,7 +38,8 @@ define Package/openocd
   DEPENDS:=+libusb-1.0 \
 	+libftdi1 \
 	+hidapi \
-	+libgpiod
+	+libgpiod \
+	+libjaylink
 endef
 
 define Package/openocd/description