Skip to content

Commit

Permalink
jimtcl: update to 0.77, the current version, enable only specific mod…
Browse files Browse the repository at this point in the history
…ules

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>
  • Loading branch information
paulfertser committed Dec 25, 2016
1 parent a5cff3a commit 56d163c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Makefile.am
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -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.])
])
Expand Down
2 changes: 1 addition & 1 deletion jimtcl
Submodule jimtcl updated from 51f65c to a9bf59

0 comments on commit 56d163c

Please sign in to comment.