bin/check-elf-dynamic-objects | 3 +++
external/cairo/ExternalProject_cairo.mk | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 7f02eb18b6051a7df42bf784eac542f2665e7281
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Sep 4 14:32:46 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 4 14:32:46 2019 +0200
tdf#121983 set RPATH of internally built libcairo.so
Change-Id: I8620fdcae2fcd34807b6b83b7c38aa5ca1ba2caa
diff --git a/external/cairo/ExternalProject_cairo.mk
b/external/cairo/ExternalProject_cairo.mk
index 6ce6993408cd..1bf3bc33a543 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no
ax_cv_c_float_words_bigendian=no)) \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
&& cp cairo-version.h src/cairo-version.h \
- && cd src && $(MAKE) \
+ && cd src && $(MAKE) && chrpath -r '$$ORIGIN'
.libs/libcairo.so.2.1160$(CAIRO_VERSION_MICRO).0 \
)
endif
commit df92637754c5e7fd59d0aec8bf646c8b42416fd5
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Sep 4 14:09:17 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 4 14:09:17 2019 +0200
tdf#121983 add whitelist for libcairo.so.2
Change-Id: If255e5af56d78047af9d38d6a7f0df070888816e
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 8848207855f5..d17a08717a8f 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -114,6 +114,9 @@ local file="$1"
# skip the majority of files, no ELF binaries here
skip=1
;;
+ */libcairo.so.2)
+ whitelist="${whitelist} ${x11whitelist} libxcb-shm.so.0
libxcb.so.1 libxcb-render.so.0"
+ ;;
*/libcairocanvaslo.so)
whitelist="${whitelist} libcairo.so.2"
;;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
