strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolves: fdo#61571 cairo not linking against internal libpng

Browse source 
the flag is called SYSTEM_LIBPNG not SYSTEM_PNG

Change-Id: I703a669f544e539f7fcfa64c0121a73f0608aecc
This commit is contained in:
Caolán McNamara 2013-02-28 09:45:54 +00:00
parent b1c0d8a7cb
commit c0f85e6879
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cairo/ExternalProject_cairo.mk
View file

@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \
ZLIB3RDLIB=-lz \
$(if $(filter NO,$(SYSTEM_PNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" png_LIBS="-L$(OUTDIR)/lib -lpng") \
$(if $(filter NO,$(SYSTEM_LIBPNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" png_LIBS="-L$(OUTDIR)/lib -lpng") \
$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \