From 56d163ce79510c7756567df00ae54155757eaa0f Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Tue, 16 Aug 2016 09:52:28 +0300 Subject: [PATCH] jimtcl: update to 0.77, the current version, enable only specific modules 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 Reviewed-on: http://openocd.zylin.com/3700 Tested-by: jenkins Reviewed-by: Andreas Fritiofson --- Makefile.am | 4 ++++ configure.ac | 2 +- jimtcl | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 69077f80a..930a30733 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/configure.ac b/configure.ac index f7deae494..5630b1116 100644 --- a/configure.ac +++ b/configure.ac @@ -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 51f65c6d3..a9bf5975f 160000 --- a/jimtcl +++ b/jimtcl @@ -1 +1 @@ -Subproject commit 51f65c6d38fbf86e1f0b036ad336761fd2ab7fa0 +Subproject commit a9bf5975fd0f89974d689a2d9ebd0873c8d64787