bin/check-elf-dynamic-objects | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit a0d533af0c110218d3812664e32930aa475be3cb
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Feb 6 14:05:09 2018 +0100
check-elf-objects: add mergedlib libs for Linux-rpm_deb-x86_64@70-TDF
Change-Id: I7b0febee10a98809073f0bfd023d39d32684a566
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 805a911bc87c..5c45b3d2cf46 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -71,7 +71,7 @@ gstreamerwhitelist="libgstpbutils-1.0.so.0
libgstvideo-1.0.so.0 libgstbase-1.0.s
gtk2whitelist="libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 libpangocairo-1.0.so.0
libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0
libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0
libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0
libdbus-glib-1.so.2 libdbus-1.so.3"
gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2
libpangocairo-1.0.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0
libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6
libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0
libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
kde4whitelist="libkio.so.5 libkfile.so.4 libkdeui.so.5 libkdecore.so.5
libQtNetwork.so.4 libQtGui.so.4 libQtCore.so.4 libglib-2.0.so.0"
-avahiwhitelist="libdbus-glib-1.so.2 libdbus-1.so.3 libgobject-2.0.so.0
libglib-2.0.so.0 libavahi-common.so.3 libavahi-client.so.3"
+avahiwhitelist="libdbus-glib-1.so.2 libdbus-1.so.3 libgobject-2.0.so.0
libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libavahi-common.so.3
libavahi-client.so.3"
kerberoswhitelist="libgssapi_krb5.so.2 libcom_err.so.2 libkrb5.so.3"
check_one_file()
@@ -127,6 +127,9 @@ local file="$1"
*/libpostgresql-sdbc-impllo.so)
whitelist="${whitelist} ${kerberoswhitelist}"
;;
+ */libmergedlo.so)
+ whitelist="${whitelist} ${x11whitelist} ${openglwhitelist}
${giowhitelist} libcups.so.2 libcairo.so.2"
+ ;;
esac
if test "${skip}" = 0 && readelf -d "${file}" &> /dev/null ; then
rpath=$(readelf -d "${file}" | grep '(\(RPATH\|RUNPATH\))' || true)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
