Kaydet (Commit) a1230334 authored tarafından Michael Stahl's avatar Michael Stahl

fdo#65244: cairo configure fails to detect libpng...

... unless there is _some_ libpng.pc on the system due to the weird way it
uses pkg-config.  Work around that by setting an png_REQUIRES variable,
which lets it use the supplied png_CFLAGS and png_LIBS.

Change-Id: I3ec4b96551e3ce624748c05fe3ab9727b191ea78
üst 1edb495a
...@@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : ...@@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \ COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \
ZLIB3RDLIB=-lz \ ZLIB3RDLIB=-lz \
png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \
png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
$(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \ $(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment