configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 14bf98b9bb3765b935316bd3a972f8ef7bb4d21e
Author: Stephan Bergmann <[email protected]>
AuthorDate: Wed Mar 20 22:19:08 2024 +0100
Commit: Stephan Bergmann <[email protected]>
CommitDate: Thu Mar 21 16:57:37 2024 +0100
Update the Android "enough memory for linking" check
...which had been introduced with 149792414e767c7526123f0e2abb7c4dc9491fa0
"android: add a check for the installed memory in the machine", presumably
at a
time when there were ENABLE_SYMBOLS and ENABLE_DEBUGINFO_FOR variables,
both of
which appear to no longer exist. So use the existing ENABLE_SYMBOLS_FOR
instead.
Change-Id: I1757f49e26e703e4a5831bf2c1f39f9337077d4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165083
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <[email protected]>
diff --git a/configure.ac b/configure.ac
index e03fa2363f03..507fef7e9d34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5027,7 +5027,7 @@ else
fi
AC_SUBST(ENABLE_SYMBOLS_FOR)
-if test -n "$with_android_ndk" -a \( -n "$ENABLE_SYMBOLS" -o -n
"$ENABLE_DEBUG" -o -n "$ENABLE_DBGUTIL" \) -a "$ENABLE_DEBUGINFO_FOR" = "all";
then
+if test -n "$with_android_ndk" -a \( -n "$ENABLE_DEBUG" -o -n
"$ENABLE_DBGUTIL" \) -a "$ENABLE_SYMBOLS_FOR" = "all"; then
# Building on Android with full symbols: without enough memory the linker
never finishes currently.
AC_MSG_CHECKING([whether enough memory is available for linking])
mem_size=$(grep -o 'MemTotal: *.\+ kB' /proc/meminfo | sed 's/MemTotal:
*\(.\+\) kB//')
