configure.ac | 4 ++--
external/firebird/ExternalProject_firebird.mk | 1 +
external/nss/ExternalProject_nss.mk | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit f490652153498b6184c6589263212b3b3326900b
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Thu Jan 28 21:15:02 2021 +0100
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Fri Jan 29 05:17:42 2021 +0100
mac: allow cross compiling with host/build x86_64-apple-macos
apple silicon supports to cross compile without special build-tools/full
cross-compiling setup, so just always pass the build/host for firebird.
firebird and nss don't recognize the -macos specifier, so substitute it
by -darwin to make those happy…
Change-Id: I953317fc87da2a20dc91acd88c8528796c3b2a69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110093
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
(cherry picked from commit 5a0991c9cd60b6ab10fe0665511e7749a0c0ecc2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110065
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/configure.ac b/configure.ac
index 07d56b0785a6..42158d2613b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8360,7 +8360,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
JAVAINC="$JAVAINC -I$JAVA_HOME/include"
;;
- darwin*)
+ darwin*|macos*)
if test -d "$JAVA_HOME/include/darwin"; then
JAVAINC="-I$JAVA_HOME/include -I$JAVA_HOME/include/darwin"
else
@@ -11178,7 +11178,7 @@ elif $GNUCP --version 2>/dev/null | grep "GNU
fileutils" >/dev/null 2>/dev/null;
AC_MSG_RESULT([yes])
else
case "$build_os" in
- darwin*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*)
+ darwin*|macos*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*)
x_GNUCP=[\#]
GNUCP=''
AC_MSG_RESULT([no gnucp found - using the system's cp command])
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index 8f8a8230227f..3e6455edb9b8 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -75,6 +75,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--enable-shared --disable-static \
) \
$(if $(filter MACOSX,$(OS)), \
+ --build=$(subst macos,darwin,$(BUILD_PLATFORM))
--host=$(subst macos,darwin,$(HOST_PLATFORM)) \
$(if $(filter 1, \
$(shell expr
'$(MAC_OS_X_VERSION_MIN_REQUIRED)' \
'<' 101200)), \
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index b97ae11a515a..a9c4fcadfc95 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)") \
$(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell
uname -m)), \
CPU_ARCH=x86_64 \
- NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)") \
+ NSPR_CONFIGURE_OPTS="--build=$(subst
macos,darwin,$(BUILD_PLATFORM)) --host=$(subst macos,darwin,$(HOST_PLATFORM))")
\
NSDISTMODE=copy \
$(MAKE) \
AR="$(AR)" \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
