This is an automated email from Gerrit.
"zapb <d...@zapb.de>" just uploaded a new patch set to Gerrit, which you can
find at https://review.openocd.org/c/openocd/+/8429
-- gerrit
commit 32b69745fddf6d48a70d127c2c808bb9f8638d71
Author: Marc Schink <d...@zapb.de>
Date: Wed Jul 3 14:34:44 2024 +0200
Drop jimtcl Git submodule
Building jimtcl as Git submodule is announced to be deprecated since
OpenOCD v0.13.0 release, drop it.
Change-Id: I550879af3e90f50b067bb77a18c77410975e8573
Signed-off-by: Marc Schink <d...@zapb.de>
diff --git a/.gitmodules b/.gitmodules
index 56a49139ab..a972b9f8a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "tools/git2cl"]
path = tools/git2cl
url = https://git.savannah.nongnu.org/git/git2cl.git
-[submodule "jimtcl"]
- path = jimtcl
- url = https://github.com/msteveb/jimtcl.git
diff --git a/Makefile.am b/Makefile.am
index 2230e628f8..155d1729e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,29 +28,16 @@ dist_man_MANS =
EXTRA_DIST =
DISTCLEANFILES =
-if INTERNAL_JIMTCL
-SUBDIRS += jimtcl
-DIST_SUBDIRS += jimtcl
-EXTRA_DIST += jimtcl/configure.gnu
-# jimtcl from 0.79 to 0.82 miss cleaning jsmn.o
-DISTCLEANFILES += jimtcl/jsmn/jsmn.o
-endif
-
# common flags used in openocd build
AM_CFLAGS = $(GCC_WARNINGS)
-AM_CPPFLAGS = $(HOST_CPPFLAGS)\
- -I$(top_srcdir)/src \
- -I$(top_builddir)/src \
- -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DBINDIR=\"$(bindir)\"
-
-if INTERNAL_JIMTCL
-AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
- -I$(top_builddir)/jimtcl
-else
-AM_CPPFLAGS += $(JIMTCL_CFLAGS)
-endif
+AM_CPPFLAGS = $(HOST_CPPFLAGS) \
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/src \
+ -DPKGDATADIR=\"$(pkgdatadir)\" \
+ -DBINDIR=\"$(bindir)\" \
+ $(JIMTCL_CFLAGS)
+
EXTRA_DIST += \
BUGS \
HACKING \
diff --git a/configure.ac b/configure.ac
index aef727f3c9..3bae9fe5e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,14 +371,6 @@ AS_CASE([$host_os],
])
])
-AC_ARG_ENABLE([internal-jimtcl],
- AS_HELP_STRING([--disable-internal-jimtcl], [Disable building internal
jimtcl]),
- [use_internal_jimtcl=$enableval], [use_internal_jimtcl=yes])
-
-AC_ARG_ENABLE([jimtcl-maintainer],
- AS_HELP_STRING([--enable-jimtcl-maintainer], [Enable maintainer mode when
building internal jimtcl]),
- [use_internal_jimtcl_maintainer=$enableval],
[use_internal_jimtcl_maintainer=no])
-
AC_ARG_ENABLE([remote-bitbang],
AS_HELP_STRING([--enable-remote-bitbang], [Enable building support for the
Remote Bitbang driver]),
[build_remote_bitbang=$enableval], [build_remote_bitbang=no])
@@ -578,26 +570,13 @@ AS_IF([test "x$enable_buspirate" != "xno"], [
AC_DEFINE([BUILD_BUSPIRATE], [0], [0 if you don't want the Buspirate JTAG
driver.])
])
-AS_IF([test "x$use_internal_jimtcl" = "xyes"], [
- AS_IF([test -f "$srcdir/jimtcl/configure"], [
- AS_IF([test "x$use_internal_jimtcl_maintainer" = "xyes"], [
- jimtcl_config_options="--disable-install-jim --with-ext=json --minimal
--disable-ssl --maintainer"
- ], [
- jimtcl_config_options="--disable-install-jim --with-ext=json --minimal
--disable-ssl"
- ])
- AX_CONFIG_SUBDIR_OPTION([jimtcl], [$jimtcl_config_options])
+PKG_CHECK_MODULES([JIMTCL], [jimtcl >= 0.79], [
+ have_jimtcl_pkg_config=yes
], [
- AC_MSG_ERROR([jimtcl not found, run git submodule init and git submodule
update.])
- ])
-], [
- PKG_CHECK_MODULES([JIMTCL], [jimtcl >= 0.79], [
- have_jimtcl_pkg_config=yes
- ], [
- have_jimtcl_pkg_config=no
- AC_CHECK_HEADER([jim.h], [], [
- AC_MSG_ERROR([jimtcl is required but not found via pkg-config and
system includes])
- ])
- ])
+ have_jimtcl_pkg_config=no
+ AC_CHECK_HEADER([jim.h], [], [
+ AC_MSG_ERROR([jimtcl is required but not found via pkg-config and system
includes])
+ ])
])
AS_IF([test "x$build_remote_bitbang" = "xyes"], [
@@ -772,7 +751,6 @@ AM_CONDITIONAL([USE_LIBJAYLINK], [test "x$use_libjaylink" =
"xyes"])
AM_CONDITIONAL([RSHIM], [test "x$build_rshim" = "xyes"])
AM_CONDITIONAL([DMEM], [test "x$build_dmem" = "xyes"])
AM_CONDITIONAL([HAVE_CAPSTONE], [test "x$enable_capstone" != "xno"])
-AM_CONDITIONAL([INTERNAL_JIMTCL], [test "x$use_internal_jimtcl" = "xyes"])
AM_CONDITIONAL([HAVE_JIMTCL_PKG_CONFIG], [test "x$have_jimtcl_pkg_config" =
"xyes"])
# Look for environ alternatives. Possibility #1: is environ in unistd.h or
stdlib.h?
diff --git a/jimtcl b/jimtcl
deleted file mode 160000
index 1933e5457b..0000000000
--- a/jimtcl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1933e5457b9512d39ebbe11ed32578aada149f49
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d1c1a2509..d1d31bdef2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,15 +14,11 @@ bin_PROGRAMS += %D%/openocd
%C%_openocd_LDADD += $(MINGWLDADD)
-if INTERNAL_JIMTCL
-%C%_openocd_LDADD += $(top_builddir)/jimtcl/libjim.a
-else
if HAVE_JIMTCL_PKG_CONFIG
%C%_openocd_LDADD += $(JIMTCL_LIBS)
else
%C%_openocd_LDADD += -ljim
endif
-endif
%C%_libopenocd_la_CPPFLAGS =
--
