diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-03-29 17:22:18 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-29 17:24:45 +0200 |
| commit | 0c58b399ea2c163babeff42e8fa5a28df847aba4 (patch) | |
| tree | 04a19de7a7408548ae5b7c6751cba2dc6df7a169 /external/cairo | |
| parent | e1acc542517b40e34d1960642dcaaaa579a71706 (diff) | |
cairo: fix malformed conditionals, these should have empty "then" branch
Change-Id: Idc83582f0b4317a4d272bc5fa8eaf2dc98785fc6
Diffstat (limited to 'external/cairo')
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index c826dcbf666c..e6a30ec4299a 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -46,8 +46,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : ZLIB3RDLIB="$(if $(SYSTEM_ZLIB),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \ 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 $(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 IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \ |