diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-10-29 08:44:11 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-10-29 08:44:11 +0100 |
commit | f7e87507640eef524edaae23495220bd96fdb435 (patch) | |
tree | 25cd28af22f5a07bf78fdbc76bb025cef8020b7f /bin/check-elf-dynamic-objects | |
parent | 81695542af1dc2cc74f16a1ce4b4dd540a64817b (diff) |
Compensate for `set -u` when LO_ELFCHECK_WHITELIST is unset
...as happens e.g. in
<https://ci.libreoffice.org/job/lo_daily_update_gandalf/515/>. (Regression
introduced with d157e510252636d3519c71415c20dfd113d40960
"check-elf-dynamic-objects: allow extending the whitelist via env-var".)
Change-Id: I93097d0bb7781b1bfac818872f40bbe38c5f5fea
Diffstat (limited to 'bin/check-elf-dynamic-objects')
-rwxr-xr-x | bin/check-elf-dynamic-objects | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index 68a2acf4beec..c1b69e6ec61d 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 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}" +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" |