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

commit 9dcf44905bf9b7df745a5eb4c49d79723185c740
Author: Jim Jagielski <[email protected]>
AuthorDate: Tue Aug 4 15:36:52 2026 -0400

    Baseline some Ubuntu build scripts for community builds
---
 .../build_aoo32bit_on_ubuntu.sh}                   | 109 ++++++---------------
 .../unxlngix6/build_aoo64bit_on_centos7.sh         |  78 ++++++++++++---
 .../build_aoo64bit_on_ubuntu.sh}                   | 109 ++++++---------------
 .../unxmaccr/build_aoo64bit_on_macosarm.sh         |   2 +-
 4 files changed, 129 insertions(+), 169 deletions(-)

diff --git a/build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh 
b/build-scripts/4.2.0-Dev6/unxlngi6/build_aoo32bit_on_ubuntu.sh
similarity index 63%
copy from build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh
copy to build-scripts/4.2.0-Dev6/unxlngi6/build_aoo32bit_on_ubuntu.sh
index b4cffe3..39e9151 100755
--- a/build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh
+++ b/build-scripts/4.2.0-Dev6/unxlngi6/build_aoo32bit_on_ubuntu.sh
@@ -3,54 +3,25 @@
 
 set -eo pipefail
 
-# Build-script for AOO 4.2.x (and later) on macOS
+# Build-script for AOO 4.2.x (and later) on Ubuntu
 #
 # ENV:
 #    LC_CTYPE=en_US.UTF-8
 #    LANG=en_US.UTF-8
-#    PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:.
 # 
 # 
 # Installed in /usr/local:
 # 
-#   o Apache ant 1.9.15 / 1.10.9
+#   o Apache ant 1.10.9
 #   o dmake 4.13.1 
(https://github.com/jimjag/dmake/archive/v4.13.1/dmake-4.13.1.tar.gz)
-#   o epm 5.0.0 (https://github.com/jimjag/epm/archive/v5.0.0/epm-5.0.0.tar.gz)
-#   o openssl 1.0.2u (no-shared)
-#   o libxml2-2.9.10 (--prefix=/usr/local --enable-shared=no)
-#   o libxslt-1.1.34 (--prefix=/usr/local --enable-shared=no)
-#   o libiconv-1.16 (./configure --enable-static --disable-shared 
--prefix=/usr/local)
-#   o curl-7.56.1 (--prefix=/usr/local --enable-shared=no)
-#   o jemalloc-5.2.1 (--prefix=/usr/local --enable-shared=no)
-#   o pkg-config 0.29.2 (--prefix=/usr/local)
-#   o GNU patch 2.7.6 (--prefix=/usr/local)
-# 
-# Macports (/opt/local):
-# 
-#   o autoconf (symlinked to ~/bin)
-#   o gnutar (symlinked to ~/bin)
-#   o perl5 (symlinked to ~/bin)
-#   o getopt (symlinked to ~/bin)
-#   o subversion
-#   o git
-# 
-# OS:
-# 
-#   o OSX 15.5
-#   o Xcode 16.4 (for community builds)
-#   o openjdk 1.8
-# 
+#   o epm 5.0.1 (https://github.com/jimjag/epm/archive/v5.0.1/epm-5.0.1.tar.gz)
+#   o autoconf 2.72
 
 #
 # Build options
 #
-AOO_MACOS_TARGET=11.0
-AOO_MACOS_SDK=
-AOO_JAVA_VERSION=1.8
+AOO_JAVA_VERSION=1.8.0
 AOO_ANT_VERSION=1.10
-#
-# Just for now, for configure
-export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
 
 #
 # Parse options
@@ -72,7 +43,7 @@ if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; 
exit 1 ; fi
 eval set -- "$AOPTS"
 
 while true; do
-  case "$1" in
+       case "$1" in
     -v | --verbose ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
     -s | --skip-config ) AOO_SKIP_CONFIG="yes"; shift ;;
     -j | --just-config ) AOO_JUST_CONFIG="yes"; shift ;;
@@ -86,8 +57,8 @@ while true; do
     -b | --beta ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; 
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; 
AOO_BUILD_DEV=""; shift ;;
     --debug ) AOO_BUILD_DEBUG="--enable-symbols"; shift ;;
     -- ) shift; break ;;
-    * ) echo "unknown option: $1"; shift ;;
-  esac
+               * ) echo "unknown option: $1"; shift ;;
+       esac
 done
 
 if [ ! -d ../main -o ! -d sal ] ; then
@@ -95,8 +66,7 @@ if [ ! -d ../main -o ! -d sal ] ; then
        exit 1
 fi
 
-
-JAVA_HOME=$(/usr/libexec/java_home -v ${AOO_JAVA_VERSION})
+JAVA_HOME=/usr/lib/jvm/java-${AOO_JAVA_VERSION})-openjdk
 if [ ! -d "$JAVA_HOME" ] ; then
     echo "JAVA_HOME not found: $JAVA_HOME"
     exit 1
@@ -115,74 +85,57 @@ export ANT_CLASSPATH
 echo "ANT_HOME is: $ANT_HOME..."
 echo "ANT_CLASSPATH is: $ANT_CLASSPATH..."
 
-echo "Building for ${AOO_BUILD_TYPE}: min macOS ${AOO_MACOS_TARGET}, Java 
$(echo ${AOO_JAVA_VERSION} | sed -e s/..//) : Ant ${AOO_ANT_VERSION}"
+echo "Building for Linux 32, Java $(echo ${AOO_JAVA_VERSION} | sed -e s/..//) 
: Ant ${AOO_ANT_VERSION}"
 echo "---"
 echo "Starting build:"
 echo ""
 \rm -f solenv/inc/reporevision.lst
-sleep 5
-#Setup build Env
-export SYSTEM_VERSION_COMPAT=1
-export MACOSX_DEPLOYMENT_TARGET=${AOO_MACOS_TARGET}
-export LIBRARY_PATH=/usr/local/lib
-export C_INCLUDE_PATH=/usr/local/include
-export CPLUS_INCLUDE_PATH=/usr/local/include
-
 if [ ! -e external/unowinreg/unowinreg.dll ] ; then
        echo "Downloading unowinreg.dll..."
-       curl -o external/unowinreg/unowinreg.dll 
http://www.openoffice.org/tools/unowinreg_prebuild/680/unowinreg.dll
+       wget -O external/unowinreg/unowinreg.dll 
http://www.openoffice.org/tools/unowinreg_prebuild/680/unowinreg.dll
 fi
 
 LANGS="ast bg ca ca-XR ca-XV cs da de el en-GB en-US es et eu fi fr gd gl he 
hi hu hy it ja kab km ko lt nb nl om pl pt pt-BR ru sk sl sr sv ta th tr uk vi 
zh-CN zh-TW"
-#LANGS="en-US"
 
-if [ ! -e configure -o configure.ac -nt configure ] ; then
+if [ -e configure.in ]; then
+    AOO_CONF_T="configure.in"
+else
+    AOO_CONF_T="configure.ac"
+fi
+if [ ! -e configure -o $AOO_CONF_T -nt configure ] ; then
        echo "Running autoconf..."
        autoconf || exit 1
 fi
 
-if [ ! -z "$AOO_MACOS_SDK" ]; then
-    AOO_MACOS_SDK="--with-macosx-sdk=$AOO_MACOS_SDK"
-fi
-
 if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
     ( ./configure   \
        --with-build-version="$(date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)") - 
`uname -sm`${AOO_BUILD_VERSION}" \
        ${AOO_VERBOSE_BUILD} \
-       ${AOO_BUILD_DEBUG} \
-       ${AOO_MACOS_SDK} \
-       --with-openldap \
-       --with-system-openssl=/usr/local \
-       --with-system-libxslt=/usr/local \
-       --with-system-libxml=/usr/local \
-       --with-system-curl=/usr/local \
-       --with-system-expat=/usr/local \
+       --with-system-stdlibs \
+       --enable-crashdump=yes \
        --enable-category-b \
        --enable-beanshell \
-       --enable-bundled-dictionaries \
        --enable-wiki-publisher \
+       --enable-bundled-dictionaries \
+       --enable-opengl  \
+       --enable-dbus  \
+       --enable-gstreamer \
+       --without-junit \
+       --without-stlport \
        --with-jdk-home="$JAVA_HOME" \
        --with-ant-home="$ANT_HOME" \
-       --without-junit \
+       --with-package-format="rpm deb" \
+       --with-lang="${LANGS}" \
        --with-epm=/usr/local/bin/epm \
        --with-dmake-path=/usr/local/bin/dmake \
-       --without-stlport \
-       --with-package-format="dmg" \
-       --disable-systray \
-       --with-macosx-target=${AOO_MACOS_TARGET} \
-       --with-alloc=jemalloc \
-       --with-lang="${LANGS}" \
-       "$@" \
        | tee config.out ) || exit 1
 fi
 
-if [ "$AOO_JUST_CONFIG" = "yes" ]; then
-    exit
-fi
-unset SDKROOT
-export SDKROOT
+source ./LinuxX86Env.Set.sh || exit 1 
 ./bootstrap || exit 1
-source ./MacOSXAARCH64Env.Set.sh || exit 1
+if [ -e solenv/inc/reporevision.lst ]; then
+       \rm solenv/inc/reporevision.lst
+fi
 cd instsetoo_native
 time perl "$SOLARENV/bin/build.pl" --all -P4 MAXPROCESS=2 EXTMAXPROCESS=2 -- 
-P2 || exit 1
 
diff --git a/build-scripts/4.2.0-Dev6/unxlngix6/build_aoo64bit_on_centos7.sh 
b/build-scripts/4.2.0-Dev6/unxlngix6/build_aoo64bit_on_centos7.sh
index a827a0f..87369d3 100755
--- a/build-scripts/4.2.0-Dev6/unxlngix6/build_aoo64bit_on_centos7.sh
+++ b/build-scripts/4.2.0-Dev6/unxlngix6/build_aoo64bit_on_centos7.sh
@@ -1,10 +1,27 @@
 #!/usr/bin/env bash
 #
+
+set -eo pipefail
+
+# Build-script for AOO 4.2.x (and later) on Ubuntu
+#
+# ENV:
+#    LC_CTYPE=en_US.UTF-8
+#    LANG=en_US.UTF-8
+# 
+# 
 # Installed in /usr/local:
+# 
+#   o Apache ant 1.10.9
 #   o dmake 4.13.1 
(https://github.com/jimjag/dmake/archive/v4.13.1/dmake-4.13.1.tar.gz)
-#   o epm 5.0.0 (https://github.com/jimjag/epm/archive/v5.0.0/epm-5.0.0.tar.gz)
+#   o epm 5.0.1 (https://github.com/jimjag/epm/archive/v5.0.1/epm-5.0.1.tar.gz)
+#   o autoconf 2.72
 
-set -eo pipefail
+#
+# Build options
+#
+AOO_JAVA_VERSION=1.8.0
+AOO_ANT_VERSION=1.10
 
 #
 # Parse options
@@ -17,17 +34,29 @@ AOO_BUILD_VERSION=
 AOO_BUILD_BETA=
 AOO_BUILD_DEV=
 AOO_BUILD_SRC=
+AOO_BUILD_ALL="yes"
+AOO_BUILD_DEBUG=
+
+AOPTS=`getopt -o vsjtdbqa:j:m:k: --long 
verbose,debug,skip-config,just-config,build-src,dev,beta,quick,ant-version:,java-version:,macos-target:,macos-sdk:
 -n 'parse-options' -- "$@"`
+if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi
+#echo "$AOPTS"
+eval set -- "$AOPTS"
 
 while true; do
        case "$1" in
-               "--verbose" ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
-               "--skip-config" ) AOO_SKIP_CONFIG="yes"; shift ;;
-               "--just-config" ) AOO_JUST_CONFIG="yes"; shift ;;
-               "--build-src" ) AOO_BUILD_SRC="yes"; shift ;;
-               "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Test Development 
Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes"; 
AOO_BUILD_BETA=""; shift ;;
-               "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; 
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; 
AOO_BUILD_DEV=""; shift ;;
-               "--" ) shift; break ;;
-               "" ) break ;;
+    -v | --verbose ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
+    -s | --skip-config ) AOO_SKIP_CONFIG="yes"; shift ;;
+    -j | --just-config ) AOO_JUST_CONFIG="yes"; shift ;;
+    -t | --build-src ) AOO_BUILD_SRC="yes"; shift ;;
+    -q | --quick ) AOO_BUILD_ALL="no"; shift ;;
+    -a | --ant-version ) AOO_ANT_VERSION=$2; shift 2 ;;
+    -j | --java-version ) AOO_JAVA_VERSION=$2; shift 2 ;;
+    -m | --macos-target ) AOO_MACOS_TARGET=$2; shift 2 ;;
+    -k | --macos-sdk ) AOO_MACOS_SDK=$2; shift 2 ;;
+    -d | --dev ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build"; 
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes"; 
AOO_BUILD_BETA=""; shift ;;
+    -b | --beta ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; 
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; 
AOO_BUILD_DEV=""; shift ;;
+    --debug ) AOO_BUILD_DEBUG="--enable-symbols"; shift ;;
+    -- ) shift; break ;;
                * ) echo "unknown option: $1"; shift ;;
        esac
 done
@@ -36,6 +65,31 @@ if [ ! -d ../main -o ! -d sal ] ; then
        echo "CHDIR into AOO's main/ directory first!"
        exit 1
 fi
+
+
+JAVA_HOME=/usr/lib/jvm/java-${AOO_JAVA_VERSION})-openjdk
+if [ ! -d "$JAVA_HOME" ] ; then
+    echo "JAVA_HOME not found: $JAVA_HOME"
+    exit 1
+fi
+export JAVA_HOME
+echo "JAVA_HOME is: $JAVA_HOME..."
+
+ANT_HOME=/usr/local/share/java/apache-ant-${AOO_ANT_VERSION}
+if [ ! -d "$ANT_HOME" ] ; then
+    echo "ANT_HOME not found: $ANT_HOME"
+    exit 1
+fi
+export ANT_HOME
+ANT_CLASSPATH=${ANT_HOME}/lib
+export ANT_CLASSPATH
+echo "ANT_HOME is: $ANT_HOME..."
+echo "ANT_CLASSPATH is: $ANT_CLASSPATH..."
+
+echo "Building for Linux 64, Java $(echo ${AOO_JAVA_VERSION} | sed -e s/..//) 
: Ant ${AOO_ANT_VERSION}"
+echo "---"
+echo "Starting build:"
+echo ""
 \rm -f solenv/inc/reporevision.lst
 if [ ! -e external/unowinreg/unowinreg.dll ] ; then
        echo "Downloading unowinreg.dll..."
@@ -69,8 +123,8 @@ if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
        --enable-gstreamer \
        --without-junit \
        --without-stlport \
-       --with-ant-home=$ANT_HOME \
-       --with-jdk-home=/usr/lib/jvm/java-1.7.0-openjdk \
+       --with-jdk-home="$JAVA_HOME" \
+       --with-ant-home="$ANT_HOME" \
        --with-package-format="rpm deb" \
        --with-lang="${LANGS}" \
        --with-epm=/usr/local/bin/epm \
diff --git a/build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh 
b/build-scripts/4.2.0-Dev6/unxlngix6/build_aoo64bit_on_ubuntu.sh
similarity index 63%
copy from build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh
copy to build-scripts/4.2.0-Dev6/unxlngix6/build_aoo64bit_on_ubuntu.sh
index b4cffe3..6db0b17 100755
--- a/build-scripts/4.2.0-Dev6/unxmaccr/build_aoo64bit_on_macosarm.sh
+++ b/build-scripts/4.2.0-Dev6/unxlngix6/build_aoo64bit_on_ubuntu.sh
@@ -3,54 +3,25 @@
 
 set -eo pipefail
 
-# Build-script for AOO 4.2.x (and later) on macOS
+# Build-script for AOO 4.2.x (and later) on Ubuntu
 #
 # ENV:
 #    LC_CTYPE=en_US.UTF-8
 #    LANG=en_US.UTF-8
-#    PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:.
 # 
 # 
 # Installed in /usr/local:
 # 
-#   o Apache ant 1.9.15 / 1.10.9
+#   o Apache ant 1.10.9
 #   o dmake 4.13.1 
(https://github.com/jimjag/dmake/archive/v4.13.1/dmake-4.13.1.tar.gz)
-#   o epm 5.0.0 (https://github.com/jimjag/epm/archive/v5.0.0/epm-5.0.0.tar.gz)
-#   o openssl 1.0.2u (no-shared)
-#   o libxml2-2.9.10 (--prefix=/usr/local --enable-shared=no)
-#   o libxslt-1.1.34 (--prefix=/usr/local --enable-shared=no)
-#   o libiconv-1.16 (./configure --enable-static --disable-shared 
--prefix=/usr/local)
-#   o curl-7.56.1 (--prefix=/usr/local --enable-shared=no)
-#   o jemalloc-5.2.1 (--prefix=/usr/local --enable-shared=no)
-#   o pkg-config 0.29.2 (--prefix=/usr/local)
-#   o GNU patch 2.7.6 (--prefix=/usr/local)
-# 
-# Macports (/opt/local):
-# 
-#   o autoconf (symlinked to ~/bin)
-#   o gnutar (symlinked to ~/bin)
-#   o perl5 (symlinked to ~/bin)
-#   o getopt (symlinked to ~/bin)
-#   o subversion
-#   o git
-# 
-# OS:
-# 
-#   o OSX 15.5
-#   o Xcode 16.4 (for community builds)
-#   o openjdk 1.8
-# 
+#   o epm 5.0.1 (https://github.com/jimjag/epm/archive/v5.0.1/epm-5.0.1.tar.gz)
+#   o autoconf 2.72
 
 #
 # Build options
 #
-AOO_MACOS_TARGET=11.0
-AOO_MACOS_SDK=
-AOO_JAVA_VERSION=1.8
+AOO_JAVA_VERSION=1.8.0
 AOO_ANT_VERSION=1.10
-#
-# Just for now, for configure
-export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
 
 #
 # Parse options
@@ -72,7 +43,7 @@ if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; 
exit 1 ; fi
 eval set -- "$AOPTS"
 
 while true; do
-  case "$1" in
+       case "$1" in
     -v | --verbose ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
     -s | --skip-config ) AOO_SKIP_CONFIG="yes"; shift ;;
     -j | --just-config ) AOO_JUST_CONFIG="yes"; shift ;;
@@ -86,8 +57,8 @@ while true; do
     -b | --beta ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build"; 
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes"; 
AOO_BUILD_DEV=""; shift ;;
     --debug ) AOO_BUILD_DEBUG="--enable-symbols"; shift ;;
     -- ) shift; break ;;
-    * ) echo "unknown option: $1"; shift ;;
-  esac
+               * ) echo "unknown option: $1"; shift ;;
+       esac
 done
 
 if [ ! -d ../main -o ! -d sal ] ; then
@@ -95,8 +66,7 @@ if [ ! -d ../main -o ! -d sal ] ; then
        exit 1
 fi
 
-
-JAVA_HOME=$(/usr/libexec/java_home -v ${AOO_JAVA_VERSION})
+JAVA_HOME=/usr/lib/jvm/java-${AOO_JAVA_VERSION})-openjdk
 if [ ! -d "$JAVA_HOME" ] ; then
     echo "JAVA_HOME not found: $JAVA_HOME"
     exit 1
@@ -115,74 +85,57 @@ export ANT_CLASSPATH
 echo "ANT_HOME is: $ANT_HOME..."
 echo "ANT_CLASSPATH is: $ANT_CLASSPATH..."
 
-echo "Building for ${AOO_BUILD_TYPE}: min macOS ${AOO_MACOS_TARGET}, Java 
$(echo ${AOO_JAVA_VERSION} | sed -e s/..//) : Ant ${AOO_ANT_VERSION}"
+echo "Building for Linux 64, Java $(echo ${AOO_JAVA_VERSION} | sed -e s/..//) 
: Ant ${AOO_ANT_VERSION}"
 echo "---"
 echo "Starting build:"
 echo ""
 \rm -f solenv/inc/reporevision.lst
-sleep 5
-#Setup build Env
-export SYSTEM_VERSION_COMPAT=1
-export MACOSX_DEPLOYMENT_TARGET=${AOO_MACOS_TARGET}
-export LIBRARY_PATH=/usr/local/lib
-export C_INCLUDE_PATH=/usr/local/include
-export CPLUS_INCLUDE_PATH=/usr/local/include
-
 if [ ! -e external/unowinreg/unowinreg.dll ] ; then
        echo "Downloading unowinreg.dll..."
-       curl -o external/unowinreg/unowinreg.dll 
http://www.openoffice.org/tools/unowinreg_prebuild/680/unowinreg.dll
+       wget -O external/unowinreg/unowinreg.dll 
http://www.openoffice.org/tools/unowinreg_prebuild/680/unowinreg.dll
 fi
 
 LANGS="ast bg ca ca-XR ca-XV cs da de el en-GB en-US es et eu fi fr gd gl he 
hi hu hy it ja kab km ko lt nb nl om pl pt pt-BR ru sk sl sr sv ta th tr uk vi 
zh-CN zh-TW"
-#LANGS="en-US"
 
-if [ ! -e configure -o configure.ac -nt configure ] ; then
+if [ -e configure.in ]; then
+    AOO_CONF_T="configure.in"
+else
+    AOO_CONF_T="configure.ac"
+fi
+if [ ! -e configure -o $AOO_CONF_T -nt configure ] ; then
        echo "Running autoconf..."
        autoconf || exit 1
 fi
 
-if [ ! -z "$AOO_MACOS_SDK" ]; then
-    AOO_MACOS_SDK="--with-macosx-sdk=$AOO_MACOS_SDK"
-fi
-
 if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
     ( ./configure   \
        --with-build-version="$(date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)") - 
`uname -sm`${AOO_BUILD_VERSION}" \
        ${AOO_VERBOSE_BUILD} \
-       ${AOO_BUILD_DEBUG} \
-       ${AOO_MACOS_SDK} \
-       --with-openldap \
-       --with-system-openssl=/usr/local \
-       --with-system-libxslt=/usr/local \
-       --with-system-libxml=/usr/local \
-       --with-system-curl=/usr/local \
-       --with-system-expat=/usr/local \
+       --with-system-stdlibs \
+       --enable-crashdump=yes \
        --enable-category-b \
        --enable-beanshell \
-       --enable-bundled-dictionaries \
        --enable-wiki-publisher \
+       --enable-bundled-dictionaries \
+       --enable-opengl  \
+       --enable-dbus  \
+       --enable-gstreamer \
+       --without-junit \
+       --without-stlport \
        --with-jdk-home="$JAVA_HOME" \
        --with-ant-home="$ANT_HOME" \
-       --without-junit \
+       --with-package-format="rpm deb" \
+       --with-lang="${LANGS}" \
        --with-epm=/usr/local/bin/epm \
        --with-dmake-path=/usr/local/bin/dmake \
-       --without-stlport \
-       --with-package-format="dmg" \
-       --disable-systray \
-       --with-macosx-target=${AOO_MACOS_TARGET} \
-       --with-alloc=jemalloc \
-       --with-lang="${LANGS}" \
-       "$@" \
        | tee config.out ) || exit 1
 fi
 
-if [ "$AOO_JUST_CONFIG" = "yes" ]; then
-    exit
-fi
-unset SDKROOT
-export SDKROOT
+source ./LinuxX86-64Env.Set.sh || exit 1 
 ./bootstrap || exit 1
-source ./MacOSXAARCH64Env.Set.sh || exit 1
+if [ -e solenv/inc/reporevision.lst ]; then
+       \rm solenv/inc/reporevision.lst
+fi
 cd instsetoo_native
 time perl "$SOLARENV/bin/build.pl" --all -P4 MAXPROCESS=2 EXTMAXPROCESS=2 -- 
-P2 || exit 1
 
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 b4cffe3..b141ca4 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
@@ -13,7 +13,7 @@ set -eo pipefail
 # 
 # Installed in /usr/local:
 # 
-#   o Apache ant 1.9.15 / 1.10.9
+#   o Apache ant 1.10.9
 #   o dmake 4.13.1 
(https://github.com/jimjag/dmake/archive/v4.13.1/dmake-4.13.1.tar.gz)
 #   o epm 5.0.0 (https://github.com/jimjag/epm/archive/v5.0.0/epm-5.0.0.tar.gz)
 #   o openssl 1.0.2u (no-shared)

Reply via email to