Fix sed on MacOS, and possibly fix jimtcl on Windows

Author: will-v-pi

build_macos.sh

@@ -7,8 +7,8 @@ SKIP_RISCV=${SKIP_RISCV-0}
 SKIP_OPENOCD=${SKIP_OPENOCD-0}
 
 # Install prerequisites
-arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
-arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
+arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi jimtcl gnu-sed --quiet
+arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi jimtcl gnu-sed --quiet
 # RISC-V prerequisites
 echo "Listing local"
 ls /usr/local/bin

packages/macos/openocd/build-openocd.sh

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 cd openocd
-sed -i 's/@ref{linuxgpiod, linuxgpiod}/@b{linuxgpiod}/g' doc/openocd.texi
+gnu-sed -i 's/@ref{linuxgpiod, linuxgpiod}/@b{linuxgpiod}/g' doc/openocd.texi
 
 ./bootstrap
 # See https://github.com/raspberrypi/openocd/issues/30

packages/windows/openocd/build-openocd.sh

@@ -6,17 +6,10 @@ BUILDDIR=$(pwd)
 INSTALLDIR="openocd-install"
 
 cd openocd
-
 sed -i 's/@ref{linuxgpiod, linuxgpiod}/@b{linuxgpiod}/g' doc/openocd.texi
 
-cd jimtcl
-./configure
-make
-make install
-cd ..
-
 ./bootstrap
-./configure --disable-werror
+./configure --disable-werror --enable-internal-jimtcl
 make clean
 make
 DESTDIR="$BUILDDIR/$INSTALLDIR" make install