diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index 7d4011597f8f..133f58d34dda 100755 --- a/bin/check-elf-dynamic-objects +++ b/bin/check-elf-dynamic-objects @@ -88,7 +88,7 @@ programfiles=$(echo ${files} | grep -o '/program/[^/]* ' | xargs -n 1 basename) # of maintaining ABI stability # allow extending the allowlist using the environment variable to be able to work # on the installer stuff without the need for a baseline setup -globalallowlist="ld-linux-x86-64.so.2 ld-linux.so.2 libc.so.6 libm.so.6 libdl.so.2 libpthread.so.0 librt.so.1 libutil.so.1 libnsl.so.1 libcrypt.so.1 libgcc_s.so.1 libstdc++.so.6 libz.so.1 libfontconfig.so.1 libfreetype.so.6 libxml2.so.2 libxslt.so.1 libexslt.so.0 ${LO_ELFCHECK_ALLOWLIST-}" +globalallowlist="ld-linux-x86-64.so.2 ld-linux.so.2 libc.so.6 libm.so.6 libdl.so.2 libpthread.so.0 librt.so.1 libutil.so.1 libnsl.so.1 libcrypt.so.1 libgcc_s.so.1 libstdc++.so.6 libz.so.1 libfontconfig.so.1 libfreetype.so.6 libxml2.so.2 libxslt.so.1 libexslt.so.0 libnspr4.so libnss3.so libnssutil3.so libplc4.so libplds4.so libsmime3.so libssl3.so ${LO_ELFCHECK_ALLOWLIST-}" x11allowlist="libX11.so.6 libX11-xcb.so.1 libXext.so.6 libSM.so.6 libICE.so.6 libXinerama.so.1 libXrender.so.1 libXrandr.so.2 libcairo.so.2" openglallowlist="libGL.so.1" gobjectallowlist="libgobject-2.0.so.0 libglib-2.0.so.0" diff --git a/configure.ac b/configure.ac index b40d16003d44..cdef1a6507e5 100644 --- a/configure.ac +++ b/configure.ac @@ -10591,7 +10591,7 @@ dnl =================================================================== dnl Check for system NSS dnl =================================================================== if test "$enable_fuzzers" != "yes" -a "$enable_nss" = "yes"; then - libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8]) + libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8],,system-if-linux) AC_DEFINE(HAVE_FEATURE_NSS) ENABLE_NSS=TRUE elif test $_os != iOS ; then diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4 index 07df27f874ca..7f2b04305c47 100644 --- a/m4/libo_externals.m4 +++ b/m4/libo_externals.m4 @@ -10,11 +10,11 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -* # <$2 uppercase variable part - used for configure.ac and make variables> # <$3 pkg-config query string> # [$4 if optional, default to: enabled, disabled or fixed (default: fixed)] -# [$5 which is preferred: (fixed-|test-)system or (fixed-)internal (default: internal)] +# [$5 which is preferred: (fixed-|test-)system or (fixed-)internal or system-if-linux (default: internal)] # [$6 ignore $with_system_libs: TRUE or blank (default: blank/false)] # # $4 fixed: fixed-enabled, as fixed-disabled makes no sense. -# $5 test-system: follows $test_system_$1, ignors $with_system_libs; no configure switch +# $5 test-system: follows $test_system_$1, ignores $with_system_libs; no configure switch # # Used configure.ac variables: # - $2_(CFLAGS|LIBS)_internal: must be filled to match the internal build @@ -71,9 +71,20 @@ m4_if( with_system_$1=yes ],[$5],[fixed-internal],[ with_system_$1=no + ],[$5],[system-if-linux],[ + AC_ARG_WITH(system-$1, + AS_HELP_STRING([--with-system-$1],[Use $1 from the operating system.]), + ,[case "$_os" in + Linux) + with_system_nss=yes + ;; + *) + with_system_nss=no + ;; + esac]) ],[ m4_if([$5],[internal],,[m4_ifnblank([$5], - [m4_fatal([$$5 ($5) must be "(fixed-|test-)system", "(fixed-)internal" or empty (=internal)])])]) + [m4_fatal([$$5 ($5) must be "(fixed-|test-)system", "(fixed-)internal", "system-if-linux" or empty (=internal)])])]) AC_ARG_WITH(system-$1, AS_HELP_STRING([--with-system-$1],[Use $1 from the operating system.]), ,[csm_default_with($1,no,$6)])