diff options
| author | Andras Timar <andras.timar@collabora.com> | 2022-02-22 13:22:54 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-02-23 11:46:28 +0100 |
| commit | b98dcadc05d878a97bbdb1ce992f21635aafded3 (patch) | |
| tree | 731634f0f2e15a4a9d36d9f61fa0e046999c2da9 | |
| parent | libxml2: upgrade to release 2.9.13 (diff) | |
| download | core-b98dcadc05d878a97bbdb1ce992f21635aafded3.tar.gz core-b98dcadc05d878a97bbdb1ce992f21635aafded3.zip | |
eliminate ENABLE_STRIP because it causes build issues in nss (Android)
Change-Id: Ie229f444d80a5f441576649e22b0c56c67cd3424
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130347
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/environment.pm | 3 |
3 files changed, 1 insertions, 13 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 04f950592f32..d00f868e2757 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -127,7 +127,6 @@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@ export DISABLE_OPENSSL=@DISABLE_OPENSSL@ export DISABLE_PYTHON=@DISABLE_PYTHON@ -export DISABLE_STRIP=@DISABLE_STRIP@ export DLOPEN_LIBS=@DLOPEN_LIBS@ export DLLTOOL=@DLLTOOL@ export DOCDIR=@DOCDIR@ @@ -204,7 +203,6 @@ export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@ export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@ export ENABLE_SKIA=@ENABLE_SKIA@ export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@ -export ENABLE_STRIP=@ENABLE_STRIP@ export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@ export ENABLE_VALGRIND=@ENABLE_VALGRIND@ export ENABLE_VLC=@ENABLE_VLC@ diff --git a/configure.ac b/configure.ac index 1b6a1fb1e220..7362ec1a34b4 100644 --- a/configure.ac +++ b/configure.ac @@ -4612,25 +4612,16 @@ if test -z "$enable_symbols"; then fi if test "$enable_symbols" = yes; then ENABLE_SYMBOLS_FOR=all - ENABLE_STRIP= - DISABLE_STRIP=1 AC_MSG_RESULT([yes]) elif test "$enable_symbols" = no; then ENABLE_SYMBOLS_FOR= - ENABLE_STRIP=1 - DISABLE_STRIP= AC_MSG_RESULT([no]) else # Selective debuginfo. ENABLE_SYMBOLS_FOR="$enable_symbols" - ENABLE_STRIP= - DISABLE_STRIP=1 AC_MSG_RESULT([for "$enable_symbols"]) fi AC_SUBST(ENABLE_SYMBOLS_FOR) -AC_SUBST(ENABLE_STRIP) -AC_SUBST(DISABLE_STRIP) - if test -n "$with_android_ndk" -a \( -n "$ENABLE_SYMBOLS" -o -n "$ENABLE_DEBUG" -o -n "$ENABLE_DBGUTIL" \) -a "$ENABLE_DEBUGINFO_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]) diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index 05dfdbfb6787..4156603a68ba 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -120,8 +120,7 @@ sub set_global_environment_variables if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; } if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; } if ( $ENV{'IGNORE_ERROR_IN_LOGFILE'} ) { $installer::globals::ignore_error_in_logfile = 1; } - if (( $ENV{'ENABLE_STRIP'} ) && ( $ENV{'ENABLE_STRIP'} ne '' )) { $installer::globals::strip = 1; } - if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; } + if (!( $ENV{'ENABLE_SYMBOLS_FOR'} ) || !( $ENV{'ENABLE_SYMBOLS_FOR'} ne '' )) { $installer::globals::strip = 1; } # it is 0 by default if ( $installer::globals::localinstalldir ) { $installer::globals::localinstalldirset = 1; } # Special handling, if LOCALINSTALLDIR contains "~" in the path |