Control: tags 1146077 + pending Dear maintainer,
I've prepared an NMU for openocd (versioned as 0.12.0-3.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for openocd-0.12.0 openocd-0.12.0 changelog | 10 ++++++ patches/jimtcl-0.84-build-issue.patch | 52 ++++++++++++++++++++++++++++++++++ patches/series | 1 3 files changed, 63 insertions(+) diff -Nru openocd-0.12.0/debian/changelog openocd-0.12.0/debian/changelog --- openocd-0.12.0/debian/changelog 2024-10-03 10:57:48.000000000 +0300 +++ openocd-0.12.0/debian/changelog 2026-09-01 13:54:24.000000000 +0300 @@ -1,3 +1,13 @@ +openocd (0.12.0-3.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Bo YU ] + * Backport upstream fix for FTBFS with jimtcl 0.84. + (Closes: #1146077) + + -- Adrian Bunk <[email protected]> Tue, 01 Sep 2026 13:54:24 +0300 + openocd (0.12.0-3) unstable; urgency=medium * Fix build with jimtcl 0.83 (Closes: #1082908) diff -Nru openocd-0.12.0/debian/patches/jimtcl-0.84-build-issue.patch openocd-0.12.0/debian/patches/jimtcl-0.84-build-issue.patch --- openocd-0.12.0/debian/patches/jimtcl-0.84-build-issue.patch 1970-01-01 02:00:00.000000000 +0200 +++ openocd-0.12.0/debian/patches/jimtcl-0.84-build-issue.patch 2026-09-01 13:54:09.000000000 +0300 @@ -0,0 +1,52 @@ +From fe0080478b9e76a4b6b64186b7b705726ac55848 Mon Sep 17 00:00:00 2001 +From: Antonio Borneo <[email protected]> +Date: Sat, 28 Sep 2024 17:58:51 +0200 +Subject: [PATCH] jimtcl: fix build with jimtcl master branch + +Current jimtcl release 0.83 has been tagged on 2024-08-28 and the +new 0.84 is on the way. + +The change [1] merged in jimtcl branch 'master' for 0.84 breaks +the build of OpenOCD. +OpenOCD releases are not frequent and jimtcl is now by default an +external build dependency. The release of jimtcl 0.84 could force +OpenOCD to deliver a fix release to support it. + +Anticipate the change [1] by detecting it at compile time, without +relying on jimtcl version, and providing an alternative code. + +Link: https://github.com/msteveb/jimtcl/commit/5669e84aad22 [1] +Change-Id: I61bf100d447083258aea222aaf15608b7cbe2e57 +Signed-off-by: Antonio Borneo <[email protected]> +Reviewed-on: https://review.openocd.org/c/openocd/+/8956 +Tested-by: jenkins +Reviewed-by: Andrzej Sierżęga <[email protected]> +--- + +--- a/src/helper/command.c ++++ b/src/helper/command.c +@@ -48,17 +48,22 @@ + /* set of functions to wrap jimtcl internal data */ + static inline bool jimcmd_is_proc(Jim_Cmd *cmd) + { ++#if defined(JIM_CMD_ISPROC) ++ // JIM_VERSION >= 84 ++ return cmd->flags & JIM_CMD_ISPROC; ++#else + return cmd->isproc; ++#endif + } + + bool jimcmd_is_oocd_command(Jim_Cmd *cmd) + { +- return !cmd->isproc && cmd->u.native.cmdProc == jim_command_dispatch; ++ return !jimcmd_is_proc(cmd) && cmd->u.native.cmdProc == jim_command_dispatch; + } + + void *jimcmd_privdata(Jim_Cmd *cmd) + { +- return cmd->isproc ? NULL : cmd->u.native.privData; ++ return jimcmd_is_proc(cmd) ? NULL : cmd->u.native.privData; + } + + static void tcl_output(void *privData, const char *file, unsigned line, diff -Nru openocd-0.12.0/debian/patches/series openocd-0.12.0/debian/patches/series --- openocd-0.12.0/debian/patches/series 2024-10-02 16:02:18.000000000 +0300 +++ openocd-0.12.0/debian/patches/series 2026-09-01 13:54:20.000000000 +0300 @@ -3,3 +3,4 @@ no-libgpiod-v2.patch jimtcl-expr-0.81-onwards.patch jimtcl-0.83-include-fix.patch +jimtcl-0.84-build-issue.patch
