]> git.sur5r.net Git - openocd/commitdiff
jimtcl: update to 0.77, the current version, enable only specific modules
authorPaul Fertser <fercerpav@gmail.com>
Tue, 16 Aug 2016 06:52:28 +0000 (09:52 +0300)
committerPaul Fertser <fercerpav@gmail.com>
Sun, 25 Dec 2016 09:20:42 +0000 (09:20 +0000)
This is needed to fix build on aarch64 to get updated config.guess.

Because some newer JimTcl modules that get enabled are failing to
build on some of the platforms OpenOCD supports, enable only a
fixed set that shouldn't cause any issues.

We also disable running Jim Tcl tests on distcheck because they never
worked (before 85358e479e5bbf295a5aaf743f3c29a5e1a4fd1c Jim commit)
but didn't break Jenkins build; with newer version they're getting run
and fail due to limited permissions for filesystem and networking
operations.

Change-Id: I0b6c6a00bf2cf0902bbb01c9c0224fe93c74ac94
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/3700
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Makefile.am
configure.ac
jimtcl

index 69077f80aeb6cfc6dbad1c78b67993ac64244503..930a3073388033a4fe2ee31362b2965d3cab86c6 100644 (file)
@@ -5,6 +5,10 @@ AUTOMAKE_OPTIONS = gnu 1.6
 # make sure we pass the correct jimtcl flags to distcheck
 DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
 
+# do not run Jim Tcl tests (esp. during distcheck)
+check-recursive:
+       @true
+
 nobase_dist_pkgdata_DATA = \
        contrib/libdcc/dcc_stdio.c \
        contrib/libdcc/dcc_stdio.h \
index f7deae494596240617d40687140425db499703b3..5630b11169737030126e06bc8c29794e3a04c320 100644 (file)
@@ -550,7 +550,7 @@ AS_IF([test "x$build_buspirate" = "xyes"], [
 
 AS_IF([test "x$use_internal_jimtcl" = "xyes"], [
   AS_IF([test -f "$srcdir/jimtcl/configure.ac"], [
-    AX_CONFIG_SUBDIR_OPTION([jimtcl], [--disable-install-jim])
+    AX_CONFIG_SUBDIR_OPTION([jimtcl], [--disable-install-jim --with-ext="eventloop array clock regexp stdlib tclcompat" --without-ext="default"])
   ], [
     AC_MSG_ERROR([jimtcl not found, run git submodule init and git submodule update.])
   ])
diff --git a/jimtcl b/jimtcl
index 51f65c6d38fbf86e1f0b036ad336761fd2ab7fa0..a9bf5975fd0f89974d689a2d9ebd0873c8d64787 160000 (submodule)
--- a/jimtcl
+++ b/jimtcl
@@ -1 +1 @@
-Subproject commit 51f65c6d38fbf86e1f0b036ad336761fd2ab7fa0
+Subproject commit a9bf5975fd0f89974d689a2d9ebd0873c8d64787