From 14a4907381f710bc4b3f5368e20bc3b7a2fed00e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Jul 2022 15:01:25 +0200 Subject: [PATCH 1/2] openocd: loosen jimtcl dep version restriction --- srcpkgs/openocd/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openocd/template b/srcpkgs/openocd/template index 856977b045ec..d6370930edc1 100644 --- a/srcpkgs/openocd/template +++ b/srcpkgs/openocd/template @@ -4,6 +4,7 @@ version=0.11.0+1 revision=1 # update to a commit that has a compatible jimtcl version _commit=830d70bfc66ada2a68c73283b9e4fa4770d408ee +_jimtcl_version=0.81 wrksrc="${pkgname}-${_commit}" build_style=gnu-configure configure_args=" @@ -41,7 +42,8 @@ configure_args=" --enable-cmsis-dap-v2 --disable-internal-libjaylink" hostmakedepends="automake pkg-config libtool which" -makedepends="hidapi-devel jimtcl-devel-0.81_1 libftdi1-devel +makedepends="hidapi-devel libftdi1-devel + jimtcl-devel>=${_jimtcl_version}_1<=${_jimtcl_version}_9999 libusb-devel libjaylink-devel capstone-devel" short_desc="Open On-Chip Debugger" maintainer="Érico Nogueira " From 2be87d0ac1333f9858f7f80ae300659f3328943a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Jul 2022 15:04:00 +0200 Subject: [PATCH 2/2] jimtcl: mention version restriction in openocd openocd depends on a specific version of jimtcl, so when jimtcl is updated, openocd needs to be updated as well --- srcpkgs/jimtcl/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/jimtcl/template b/srcpkgs/jimtcl/template index 25d32bb5c5ae..0cf62f5657b6 100644 --- a/srcpkgs/jimtcl/template +++ b/srcpkgs/jimtcl/template @@ -1,5 +1,6 @@ # Template file for 'jimtcl' pkgname=jimtcl +# keep in sync with _jimtcl_version in openocd version=0.81 revision=1 build_style=gnu-configure