external/cairo/ExternalProject_cairo.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 856038857f566269d8b21fc1c86aa4b5eb7ae048
Author: Korrawit Pruegsanusak <detective.conan.1...@gmail.com>
Date: Sun Mar 20 15:07:00 2016 +0700
FREETYPE_CFLAGS is already set when using external freetype
When you're on Debian derivatives, using internal cairo but external
(system's) freetype, the "ft2build.h" is in /usr/include/freetype2/,
not /usr/include/, which is already in FREETYPE_CFLAGS since configure.ac
Change-Id: I24c697776bd77d423ebeafd38315cb76cad28f9b
Reviewed-on: https://gerrit.libreoffice.org/23334
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/external/cairo/ExternalProject_cairo.mk
b/external/cairo/ExternalProject_cairo.mk
index e74f5f0..6bbe957 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -45,7 +45,7 @@ $(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)" \
- FREETYPE_CFLAGS="-I$(call
gb_UnpackedTarball_get_dir,freetype)/include" \
+ $(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call
gb_UnpackedTarball_get_dir,freetype)/include") \
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)
\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
