configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b68de4053de20e25b6a32b51399ecfb890cb7e60
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Mar 22 13:15:52 2021 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Mar 23 08:35:56 2021 +0100
Make PLATFORMID=macosx_aarch64 match RTL_ARCH=AARCH64
e.g. Extension_test-passive generated a workdir/Extension/test-passive.oxt
META-INF/manifest.xml containing
m:media-type="application/vnd.sun.star.uno-components;platform=macosx_arm64"
from PLATFORMID (see solenv/gbuild/Extension.mk), but dp_misc::platform_fits
(desktop/source/deployment/misc/dp_platform.cxx) matches that platform
attribute's architecture substring ("arm64") against dp_misc::StrCPU::get(),
i.e., RTL_ARCH ("aarch64"), which thus failed.
Change-Id: I82896d6b01948aaa9461d7027ffce25dcf245aac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112889
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index 2eb0e423ab4e..4e422e2648b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4638,7 +4638,7 @@ darwin*|macos*)
else
CPUNAME=AARCH64
RTL_ARCH=AARCH64
- PLATFORMID=macosx_arm64
+ PLATFORMID=macosx_aarch64
fi
;;
x86_64)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
