Switch openocd back to internal jimtcl build

Author: will-v-pi

build_linux.sh

@@ -7,7 +7,7 @@ SKIP_RISCV=${SKIP_RISCV-0}
 SKIP_OPENOCD=${SKIP_OPENOCD-0}
 
 # Install prerequisites
-sudo apt install -y jq cmake libtool automake libusb-1.0-0-dev libhidapi-dev libftdi1-dev libjim-dev patchelf
+sudo apt install -y jq cmake libtool automake libusb-1.0-0-dev libhidapi-dev libftdi1-dev patchelf
 # RISC-V prerequisites
 sudo apt install -y autoconf automake autotools-dev curl python3 python3-pip libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev ninja-build git cmake libglib2.0-dev libslirp-dev
 # RPi Only prerequisites

build_macos.sh

@@ -10,9 +10,9 @@ SKIP_PICOTOOL=${SKIP_PICOTOOL-0}
 echo "Running on $(uname -m)"
 
 # Install prerequisites
-arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
+arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi --quiet
 if [[ $(uname -m) == 'arm64' ]]; then
-    arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
+    arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi --quiet
 fi
 # RISC-V prerequisites
 echo "Listing local"

packages/linux/openocd/build-openocd.sh

@@ -7,7 +7,7 @@ export LDFLAGS=-static
 
 cd openocd
 ./bootstrap
-./configure --disable-werror
+./configure --disable-werror --enable-internal-jimtcl
 make clean
 make
 INSTALLDIR="$PWD/../openocd-install/usr/local/bin"
@@ -19,5 +19,4 @@ cd $INSTALLDIR
 if [[ $(uname -m) == 'aarch64' ]]; then
     cp $(ldd openocd | egrep -o "(/.*/libgpiod\.so\.\S*)") ./
 fi
-cp $(ldd openocd | egrep -o "(/.*/libjim\.so\.\S*)") ./
 patchelf --set-rpath '$ORIGIN' openocd

packages/macos/openocd/build-openocd.sh

@@ -7,7 +7,7 @@ cd openocd
 ./bootstrap
 # See https://github.com/raspberrypi/openocd/issues/30
 # ./configure --disable-werror CAPSTONE_CFLAGS="$(pkg-config capstone --cflags | sed s/.capstone\$//)"
-./configure --disable-werror
+./configure --disable-werror --enable-internal-jimtcl
 make clean
 make
 INSTALLDIR="$PWD/../openocd-install-$(uname -m)/usr/local/bin"