[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - external/cairo

[Michael Stahl (via logerrit)]

 external/cairo/ExternalProject_cairo.mk          |    7 +++++--
 external/cairo/UnpackedTarball_cairo.mk          |    1 +
 external/cairo/cairo/cairo-libtool-rpath.patch.1 |   12 ++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 2fb82dbe9a970f1acef8330334832b59e67f5aba
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Sep 4 17:57:40 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 5 12:28:08 2019 +0200

    tdf#121983 cairo: fix RPATH to contain $ORIGIN, not libtool's nonsense
    
    Also transmit $(verbose) to the build so it's debuggable.
    
    Change-Id: I8620fdcae2fcd34807b6b83b7c38aa5ca1ba2caa
    Reviewed-on: https://gerrit.libreoffice.org/78596
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index 1bf3bc33a543..39a05303344b 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -48,11 +48,14 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 		$(if $(filter ANDROID iOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
 		LIBS="$(ZLIB_LIBS)" \
 		pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \
-		pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
+		pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \
+			$(if $(filter LINUX,$(OS)),-Wl$(COMMA)-z$(COMMA)origin \
+					-Wl$(COMMA)-rpath$(COMMA)\\\$$\$$ORIGIN)" \
 		png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \
 		png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
 		$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \
 		$(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \
+		$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 		$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \
 		$(if $(filter ANDROID iOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(DISABLE_GUI)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \
 		$(if $(filter iOS,$(OS)),--enable-quartz --enable-quartz-font) \
@@ -63,7 +66,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) && chrpath -r '$$ORIGIN' .libs/libcairo.so.2.1160$(CAIRO_VERSION_MICRO).0 \
+	&& cd src && $(MAKE) \
 	)
 
 endif
diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk
index b260446edf8f..2807cebd177c 100644
--- a/external/cairo/UnpackedTarball_cairo.mk
+++ b/external/cairo/UnpackedTarball_cairo.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cairo,$(CAIRO_TARBALL),,cairo))
 $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
 	external/cairo/cairo/cairo-1.10.2.patch \
 	external/cairo/cairo/cairo.oldfreetype.patch \
+	external/cairo/cairo/cairo-libtool-rpath.patch.1 \
 ))
 
 ifeq ($(OS),iOS)
diff --git a/external/cairo/cairo/cairo-libtool-rpath.patch.1 b/external/cairo/cairo/cairo-libtool-rpath.patch.1
new file mode 100644
index 000000000000..dffa25414f61
--- /dev/null
+++ b/external/cairo/cairo/cairo-libtool-rpath.patch.1
@@ -0,0 +1,12 @@
+Prevent libtool from adding annoying stuff to RPATH
+
+--- cairo/configure.orig	2018-10-19 22:20:08.000000000 +0200
++++ cairo/configure	2019-09-04 17:53:00.927539686 +0200
+@@ -16592,6 +16592,7 @@
+ 	    esac
+ 	    ;;
+ 	esac
++hardcode_libdir_flag_spec=
+ 	;;
+ 
+       lynxos*)