(openoffice-devtools) branch main updated: Sync up macOS build scripts

[jim]

This is an automated email from the ASF dual-hosted git repository.

jimjag pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-devtools.git


The following commit(s) were added to refs/heads/main by this push:
     new b34153a  Sync up macOS build scripts
b34153a is described below

commit b34153a5f065ca9056a5fad9f823ccc10ca71c09
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Thu Jul 30 11:54:27 2026 -0400

    Sync up macOS build scripts
---
 build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh | 4 +---
 build-scripts/4.2.0-Dev6/unxmacos/build_aoo64bit_on_macos.sh    | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh 
b/build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh
index c0c548b..18bd4a6 100755
--- a/build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh
+++ b/build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh
@@ -50,9 +50,7 @@ AOO_JAVA_VERSION=1.8
 AOO_ANT_VERSION=1.10
 #
 # Just for now, for configure
-if [ -z "$SDKROOT" ] ; then
-  export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
-fi
+export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
 
 #
 # Parse options
diff --git a/build-scripts/4.2.0-Dev6/unxmacos/build_aoo64bit_on_macos.sh 
b/build-scripts/4.2.0-Dev6/unxmacos/build_aoo64bit_on_macos.sh
index 2800fb6..3fd6ea0 100755
--- a/build-scripts/4.2.0-Dev6/unxmacos/build_aoo64bit_on_macos.sh
+++ b/build-scripts/4.2.0-Dev6/unxmacos/build_aoo64bit_on_macos.sh
@@ -50,9 +50,7 @@ AOO_JAVA_VERSION=1.8
 AOO_ANT_VERSION=1.10
 #
 # Just for now, for configure
-if [ -z "$SDKROOT" ] ; then
-  export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
-fi
+export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
 
 #
 # Parse options
@@ -158,6 +156,7 @@ if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
        --with-system-libxslt=/usr/local \
        --with-system-libxml=/usr/local \
        --with-system-curl=/usr/local \
+       --with-system-expat=/usr/local \
        --enable-category-b \
        --enable-beanshell \
        --enable-bundled-dictionaries \