diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 10:00:16 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 11:53:48 +0000 |
| commit | d09acc4db55071c1de95d666b4edc5a63bc1f7f3 (patch) | |
| tree | ff8f8841e35aef8b182a054b3b2ea5c36211210d /external/cairo | |
| parent | uitest: we need the workaround for the race condition also for file loading (diff) | |
| download | core-d09acc4db55071c1de95d666b4edc5a63bc1f7f3.tar.gz core-d09acc4db55071c1de95d666b4edc5a63bc1f7f3.zip | |
enable building cairo statically with DISABLE_DYNLOADING
Change-Id: I45cfb14be3a92754c698fd553605b3a252a53e53
Reviewed-on: https://gerrit.libreoffice.org/32221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/cairo')
| -rw-r--r-- | external/cairo/ExternalPackage_cairo.mk | 2 | ||||
| -rw-r--r-- | external/cairo/ExternalPackage_pixman.mk | 2 | ||||
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 2 | ||||
| -rw-r--r-- | external/cairo/ExternalProject_pixman.mk | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk index b1686973537a..e9cd1e819ab7 100644 --- a/external/cairo/ExternalPackage_cairo.mk +++ b/external/cairo/ExternalPackage_cairo.mk @@ -11,10 +11,12 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo)) $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) +ifneq ($(DISABLE_DYNLOADING),TRUE) ifneq ($(OS),ANDROID) $(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11400.6)) endif +endif # vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalPackage_pixman.mk b/external/cairo/ExternalPackage_pixman.mk index f101f6a58e1e..288a9701afda 100644 --- a/external/cairo/ExternalPackage_pixman.mk +++ b/external/cairo/ExternalPackage_pixman.mk @@ -11,11 +11,13 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman)) $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman)) +ifneq ($(DISABLE_DYNLOADING),TRUE) ifneq ($(OS),ANDROID) $(eval $(call gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.34.0)) endif +endif # vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index edf30711598f..4f9c503cd841 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -52,7 +52,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : 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 $(filter ANDROID IOS,$(OS)),--disable-shared,--disable-static) \ + $(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,$(ENABLE_HEADLESS)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \ $(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \ --disable-valgrind \ diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk index 083b0b6094e8..33a4b8d150e5 100644 --- a/external/cairo/ExternalProject_pixman.mk +++ b/external/cairo/ExternalProject_pixman.mk @@ -32,7 +32,7 @@ else $(call gb_ExternalProject_get_state_target,pixman,build) : $(call gb_ExternalProject_run,build,\ ./configure \ - $(if $(filter MACOSX IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \ $(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ |