configure.ac | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 0f02651d693b131060595313db31c7b4b8dad528
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Tue Mar 23 15:52:31 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Wed Mar 24 21:10:20 2021 +0100
use --enable-ooenv only if --enable-debug/dbgutil
I'm not sure what the original purpose of the ooenv script was,
but now it contains only debugging settings such as malloc debugging,
which has a noticeable overhead (8.2s->10.1s in my random case).
At least openSUSE appears to not actually package the script, but
it still doesn't make sense to use this script in non-debug builds.
Change-Id: I4518bb1680a543ed520399c11c83dd6dc5539f71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112999
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 7cc376d9b242..9a96e56ab8e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1493,8 +1493,8 @@ libo_FUZZ_ARG_ENABLE(compiler-plugins-analyzer-pch,
relevant in the --disable-compiler-plugins case.]))
libo_FUZZ_ARG_ENABLE(ooenv,
- AS_HELP_STRING([--disable-ooenv],
- [Disable ooenv for the instdir installation.]))
+ AS_HELP_STRING([--enable-ooenv],
+ [Enable ooenv for the instdir installation.]))
AC_ARG_ENABLE(lto,
AS_HELP_STRING([--enable-lto],
@@ -5427,6 +5427,13 @@ AC_SUBST(ASSERT_ALWAYS_ABORT)
# ===================================================================
if test $_os != "WINNT" -a $_os != "Darwin"; then
AC_MSG_CHECKING([whether to use ooenv for the instdir installation])
+ if test -z "$enable_ooenv"; then
+ if test -n "$ENABLE_DEBUG$ENABLE_DBGUTIL"; then
+ enable_ooenv=yes
+ else
+ enable_ooenv=no
+ fi
+ fi
if test "$enable_ooenv" = "no"; then
AC_MSG_RESULT([no])
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
