cairo: try if --disable-xcb fixes android build

Change-Id: I2a49f4e2b60fb51e4ec03dd82b7e54d1f39d887a
This commit is contained in:
Michael Stahl
2016-08-25 11:49:45 +02:00
parent 065913d8aa
commit a95ef33133

View File

@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \ $(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_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \
$(if $(filter ANDROID IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID IOS,$(OS)),--disable-shared,--disable-static) \
$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \ $(if $(filter ANDROID IOS,$(OS)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb) \
$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \ $(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
--disable-valgrind \ --disable-valgrind \
$(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \ $(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \