[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects

[Libreoffice Gerrit user]

 bin/check-elf-dynamic-objects |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d157e510252636d3519c71415c20dfd113d40960
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Sat Oct 27 23:47:54 2018 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Sun Oct 28 18:41:54 2018 +0100

    check-elf-dynamic-objects: allow extending the whitelist via env-var
    
    to allow working on packaging with epm without a baseline setup...
    
    Change-Id: I9ab737cd52adf51c9eb23a4bc67f09c0ac06647e
    Reviewed-on: https://gerrit.libreoffice.org/62454
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 10ec7292ec71..68a2acf4beec 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -86,7 +86,9 @@ programfiles=$(echo ${files} | grep -o '/program/[^/]* ' | xargs -n 1 basename)
 
 # whitelists should contain only system libraries that have a good reputation
 # of maintaining ABI stability
-globalwhitelist="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"
+# allow extending the whitelist using the environment variable to be able to work
+# on the installer stuff without the need for a baseline setup
+globalwhitelist="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_WHITELIST}"
 x11whitelist="libX11.so.6 libXext.so.6 libSM.so.6 libICE.so.6 libXinerama.so.1 libXrender.so.1 libXrandr.so.2 libcairo.so.2"
 openglwhitelist="libGL.so.1"
 giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"