Various build updates, e.g. use --disable-zipfs when building with Tcl 8.6

6 files changed, 18 insertions, 19 deletions

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 3ff8405..7315033 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -1,4 +1,4 @@
-name: Linux
+name: Linux (with Tcl 8.7)
 on: [push]
 permissions:
   contents: read
@@ -50,7 +50,7 @@ jobs:
           OPTS: ${{ matrix.compiler }}${{ matrix.cfgopt }}
       - name: Configure and Build Tcl
         run: |
-          ./configure ${CFGOPT} "--prefix=$HOME/install dir" || {
+          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
             echo "::warning::Failure during Tcl Configure"
             exit 1
@@ -151,7 +151,7 @@ jobs:
           COMPILER: ${{ matrix.compiler }}
       - name: Configure and Build Tcl
         run: |
-          ./configure ${CFGOPT} "--prefix=$HOME/install dir" || {
+          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
             echo "::warning::Failure during Tcl Configure"
             exit 1
diff --git a/.github/workflows/linux-with-tcl8-build.yml b/.github/workflows/linux-with-tcl8-build.yml
index 9ae9bfd..5b4f969 100644
--- a/.github/workflows/linux-with-tcl8-build.yml
+++ b/.github/workflows/linux-with-tcl8-build.yml
@@ -1,4 +1,4 @@
-name: Linux (with Tcl 8.7)
+name: Linux
 on: [push]
 permissions:
   contents: read
@@ -50,7 +50,7 @@ jobs:
           OPTS: ${{ matrix.compiler }}${{ matrix.cfgopt }}
       - name: Configure and Build Tcl
         run: |
-          ./configure ${CFGOPT} "--prefix=$HOME/install dir" || {
+          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
             echo "::warning::Failure during Tcl Configure"
             exit 1
@@ -63,7 +63,7 @@ jobs:
         working-directory: tcl/unix
       - name: Configure (opts=${{ matrix.cfgopt }})
         run: |
-          ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
+          ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH --disable-zipfs "--prefix=$HOME/install dir" || {
             cat config.log
             echo "::error::Failure during Configure"
             exit 1
@@ -132,7 +132,7 @@ jobs:
           COMPILER: ${{ matrix.compiler }}
       - name: Configure and Build Tcl
         run: |
-          ./configure ${CFGOPT} "--prefix=$HOME/install dir" || {
+          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
             echo "::warning::Failure during Tcl Configure"
             exit 1
diff --git a/.github/workflows/linux-with-tcl9-build.yml b/.github/workflows/linux-with-tcl9-build.yml
index b8ec212..ec8a12e 100644
--- a/.github/workflows/linux-with-tcl9-build.yml
+++ b/.github/workflows/linux-with-tcl9-build.yml
@@ -50,7 +50,7 @@ jobs:
           OPTS: ${{ matrix.compiler }}${{ matrix.cfgopt }}
       - name: Configure and Build Tcl
         run: |
-          ./configure ${CFGOPT} "--prefix=$HOME/install dir" || {
+          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
             echo "::warning::Failure during Tcl Configure"
             exit 1
@@ -132,7 +132,7 @@ jobs:
           COMPILER: ${{ matrix.compiler }}
       - name: Configure and Build Tcl
         run: |
-          ./configure ${CFGOPT} "--prefix=$HOME/install dir" || {
+          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
             echo "::warning::Failure during Tcl Configure"
             exit 1
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index b4d850d..37187e0 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -84,13 +84,13 @@ jobs:
       - name: Add X11 (if required)
         if: ${{ env.USE_XVFB == 'true' }}
         run: |
+          brew install icu4c
           brew install --cask xquartz
           sudo /opt/X11/libexec/privileged_startx || true
         working-directory: .
       - name: Build Tcl
-        # Note that macOS is always a 64 bit platform
         run: |
-          ./configure --enable-64bit ${CFGOPT} "--prefix=$HOME/install dir" || {
+          ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
             echo "::error::Failure during Tcl Configure"
             exit 1
@@ -107,9 +107,8 @@ jobs:
         env:
           CFGOPT: --enable-symbols=${{ matrix.symbols }}
       - name: Configure (symbols=${{ matrix.symbols }} ${{matrix.options }})
-        # Note that macOS is always a 64 bit platform
         run: |
-          ./configure --enable-64bit ${CFGOPT} "--prefix=$HOME/install dir" --disable-xft || {
+          ./configure $CFGOPT "--prefix=$HOME/install dir" --disable-xft || {
             cat config.log
             echo "::error::Failure during Configure"
             exit 1
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
index e3f9404..6a80448 100644
--- a/.github/workflows/onefiledist.yml
+++ b/.github/workflows/onefiledist.yml
@@ -33,7 +33,7 @@ jobs:
         working-directory: "."
       - name: Configure Tcl
         run: |
-          ./configure $CFGOPT --enable-zipfs --prefix=$INST_DIR
+          ./configure $CFGOPT --prefix=$INST_DIR
         working-directory: tcl/unix
       - name: Build & Install Tcl
         run: |
@@ -75,7 +75,7 @@ jobs:
         shell: bash
     env:
       CC: gcc
-      CFGOPT: --disable-symbols --disable-shared --enable-64bit
+      CFGOPT: --disable-symbols --disable-shared
     steps:
       - name: Checkout Tk
         uses: actions/checkout@v3
@@ -105,7 +105,7 @@ jobs:
         working-directory: "."
       - name: Configure Tcl
         run: |
-          ./configure $CFGOPT --enable-zipfs --prefix=$INST_DIR
+          ./configure $CFGOPT --prefix=$INST_DIR
         working-directory: tcl/unix
       - name: Build & Install Tcl
         run: |
@@ -185,7 +185,7 @@ jobs:
         working-directory: "."
       - name: Configure Tcl
         run: |
-          ./configure $CFGOPT --enable-zipfs --prefix=$INST_DIR
+          ./configure $CFGOPT --prefix=$INST_DIR
         working-directory: tcl/win
       - name: Build & Install Tcl
         run: |
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 626bd2e..b0d844a 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -125,7 +125,7 @@ jobs:
         working-directory: generic
       - name: Configure and Build Tcl
         run: |
-          ./configure ${CFGOPT} "--prefix=$INSTALL_DIR" || {
+          ./configure $CFGOPT "--prefix=$INSTALL_DIR" || {
             cat config.log
             echo "::warning::Failure during Tcl Configure"
             exit 1
@@ -140,7 +140,7 @@ jobs:
         working-directory: tcl/win
       - name: Configure Tk (symbols=${{ matrix.symbols }})
         run: |
-          ./configure ${CFGOPT} "--prefix=$HOME/INSTALL_DIR" "--with-tcl=$TCL_CONFIG_PATH" || {
+          ./configure $CFGOPT "--prefix=$HOME/INSTALL_DIR" "--with-tcl=$TCL_CONFIG_PATH" || {
             cat config.log
             echo "::error::Failure during Configure"
             exit 1