CVS commit: pkgsrc/devel/openocd

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Apr  6 10:07:06 UTC 2025

Modified Files:
        pkgsrc/devel/openocd: Makefile distinfo
Added Files:
        pkgsrc/devel/openocd/patches: patch-src_helper_configuration.h
            patch-src_helper_jim-nvp.c patch-src_openocd.c

Log Message:
openocd: fix build with jimtcl 0.83


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/openocd/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/openocd/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/openocd/patches/patch-src_helper_configuration.h \
    pkgsrc/devel/openocd/patches/patch-src_helper_jim-nvp.c \
    pkgsrc/devel/openocd/patches/patch-src_openocd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/openocd/Makefile
diff -u pkgsrc/devel/openocd/Makefile:1.9 pkgsrc/devel/openocd/Makefile:1.10
--- pkgsrc/devel/openocd/Makefile:1.9   Wed May 17 15:29:13 2023
+++ pkgsrc/devel/openocd/Makefile       Sun Apr  6 10:07:06 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/05/17 15:29:13 nikita Exp $
+# $NetBSD: Makefile,v 1.10 2025/04/06 10:07:06 adam Exp $
 
 DISTNAME=      openocd-0.12.0
 CATEGORIES=    devel
@@ -16,7 +16,6 @@ USE_LANGUAGES=        c c++
 USE_TOOLS+=    gmake pkg-config
 INFO_FILES=    yes
 
-CONFIGURE_ARGS+=       --infodir=${PREFIX}/info
 CONFIGURE_ARGS+=       --disable-internal-jimtcl
 BUILDLINK_TRANSFORM+=  rm:-Werror
 OVERRIDE_DIRDEPTH?=    5

Index: pkgsrc/devel/openocd/distinfo
diff -u pkgsrc/devel/openocd/distinfo:1.12 pkgsrc/devel/openocd/distinfo:1.13
--- pkgsrc/devel/openocd/distinfo:1.12  Wed May 17 15:29:13 2023
+++ pkgsrc/devel/openocd/distinfo       Sun Apr  6 10:07:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2023/05/17 15:29:13 nikita Exp $
+$NetBSD: distinfo,v 1.13 2025/04/06 10:07:06 adam Exp $
 
 BLAKE2s (openocd-0.12.0.tar.bz2) = ae90ac43aec9e72a8ddc7123c5e42fef35e8971cdca3b936a1d14cef74c4dc5c
 SHA512 (openocd-0.12.0.tar.bz2) = b32a8b9fe81ad23d8a544284f4bc626ca302e498dae95399a2f36756407dd1a63e8e9655ca1084e7cc13cf1b932d8f6a480f470a4c3ad502cd884ec7508738e9
@@ -6,3 +6,6 @@ Size (openocd-0.12.0.tar.bz2) = 6790673 
 SHA1 (patch-Makefile.in) = 4035163eb0563254dc4f1bc4a0abac9fbea633e1
 SHA1 (patch-configure) = caef476c5bb76dff29e67c0f9e9fdde95d968bf2
 SHA1 (patch-src_flash_nor_fm4.c) = b14914ebe08a7c7d9f12c3999c5e6edeae2569e0
+SHA1 (patch-src_helper_configuration.h) = fa3da409b1fdb162aea2cd635df084503b3923d9
+SHA1 (patch-src_helper_jim-nvp.c) = 0e5c7de9feb48dcd47c3d79bbaf41787bb1e799d
+SHA1 (patch-src_openocd.c) = d2b7ebdca9800c15fc27b23e9e8c28665900fa5b

Added files:

Index: pkgsrc/devel/openocd/patches/patch-src_helper_configuration.h
diff -u /dev/null pkgsrc/devel/openocd/patches/patch-src_helper_configuration.h:1.1
--- /dev/null   Sun Apr  6 10:07:06 2025
+++ pkgsrc/devel/openocd/patches/patch-src_helper_configuration.h       Sun Apr  6 10:07:06 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_helper_configuration.h,v 1.1 2025/04/06 10:07:06 adam Exp $
+
+Fix build.
+
+--- src/helper/configuration.h.orig    2025-04-06 05:55:27.179913451 +0000
++++ src/helper/configuration.h
+@@ -11,6 +11,7 @@
+ #ifndef OPENOCD_HELPER_CONFIGURATION_H
+ #define OPENOCD_HELPER_CONFIGURATION_H
+ 
++#include <stdio.h>
+ #include <helper/command.h>
+ 
+ int parse_cmdline_args(struct command_context *cmd_ctx,
Index: pkgsrc/devel/openocd/patches/patch-src_helper_jim-nvp.c
diff -u /dev/null pkgsrc/devel/openocd/patches/patch-src_helper_jim-nvp.c:1.1
--- /dev/null   Sun Apr  6 10:07:06 2025
+++ pkgsrc/devel/openocd/patches/patch-src_helper_jim-nvp.c     Sun Apr  6 10:07:06 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_helper_jim-nvp.c,v 1.1 2025/04/06 10:07:06 adam Exp $
+
+Fix build.
+
+--- src/helper/jim-nvp.c.orig  2025-04-06 05:56:28.632419321 +0000
++++ src/helper/jim-nvp.c
+@@ -21,6 +21,7 @@
+ #endif
+ 
+ #include "jim-nvp.h"
++#include <stdio.h>
+ #include <string.h>
+ 
+ int jim_get_nvp(Jim_Interp *interp,
Index: pkgsrc/devel/openocd/patches/patch-src_openocd.c
diff -u /dev/null pkgsrc/devel/openocd/patches/patch-src_openocd.c:1.1
--- /dev/null   Sun Apr  6 10:07:06 2025
+++ pkgsrc/devel/openocd/patches/patch-src_openocd.c    Sun Apr  6 10:07:06 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_openocd.c,v 1.1 2025/04/06 10:07:06 adam Exp $
+
+Fix build with jimtcl 0.83.
+
+--- src/openocd.c.orig 2025-04-06 05:49:36.109698542 +0000
++++ src/openocd.c
+@@ -255,9 +255,9 @@ static int jim_expr_command(Jim_Interp *
+               Jim_Obj *obj = Jim_ConcatObj(interp, argc - 1, argv + 1);
+               Jim_IncrRefCount(obj);
+               const char *s = Jim_String(obj);
+-              struct jim_scriptobj *script = Jim_GetIntRepPtr(interp->currentScriptObj);
+-              if (interp->currentScriptObj == interp->emptyObj ||
+-                              strcmp(interp->currentScriptObj->typePtr->name, "script") ||
++              struct jim_scriptobj *script = Jim_GetIntRepPtr(interp->unused_currentScriptObj);
++              if (interp->unused_currentScriptObj == interp->emptyObj ||
++                              strcmp(interp->unused_currentScriptObj->typePtr->name, "script") ||
+                               script->subst_flags ||
+                               script->filename_obj == interp->emptyObj)
+                       LOG_WARNING("DEPRECATED! use 'expr { %s }' not 'expr %s'", s, s);