diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-09-04 17:57:40 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-06 17:15:35 +0200 |
| commit | 89885b911fe342291e562f1c4293314b90ea8281 (patch) | |
| tree | 819ffd7e8bb8e44aa2fd45958b8a85c3ad3f8dbc | |
| parent | 948d77ec605d9d31047a8e5e34a51303d9cff815 (diff) | |
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@cib.de>
(cherry picked from commit bb9c07b82f4921941112de7e545af13a24b37f5d)
Reviewed-on: https://gerrit.libreoffice.org/78629
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 5 | ||||
| -rw-r--r-- | external/cairo/UnpackedTarball_cairo.mk | 1 | ||||
| -rw-r--r-- | external/cairo/cairo/cairo-libtool-rpath.patch.1 | 12 |
3 files changed, 17 insertions, 1 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index 6ce6993408cd..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) \ diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk index 895950a58301..9cd795fc4a0b 100644 --- a/external/cairo/UnpackedTarball_cairo.mk +++ b/external/cairo/UnpackedTarball_cairo.mk @@ -13,6 +13,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-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*) |