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/ExternalProject_cairo.mk | |
| parent | 66311a5ae72149167c7534d90825e35dc4a0e037 (diff) | |
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/ExternalProject_cairo.mk')
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |