RepositoryExternal.mk | 3 +++
cairo/ExternalProject_cairo.mk | 4 ++++
2 files changed, 7 insertions(+)
New commits:
commit adbe531ef00b8149f9c09c27928746a6ed595043
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Nov 20 22:24:09 2012 +0100
cairo: to actually use the right cairo-version.h...
...it is necessary to overwrite dummy src/cairo-version.h because that
is included with "" from src/cairo.h which means that at least GCC 4.7
looks in the current directory src/ first...
Change-Id: I4a254021ad318ffb428242443f7e1e29c876915c
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index cb51d62..54a220b 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -26,6 +26,9 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
else
+# overwrite src/cairo-version.h because that is just a dummy file and included
+# from cairo.h in non-overridable way
+
$(call gb_ExternalProject_get_state_target,cairo,build) :
cd $(EXTERNAL_WORKDIR) \
&& ./configure \
@@ -46,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
+ && cp cairo-version.h src/cairo-version.h \
&& cd src && $(MAKE) \
&& touch $@
commit de14220ae5b5e512007df004acec16812992f5f4
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Nov 20 22:05:36 2012 +0100
cairo: add missing dependencies, and add include dir...
...to find the right cairo-version.h
Change-Id: Ia609f7498aae97a68e908101bdeae274d940d2e8
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5b66ac1..bc717b1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -754,7 +754,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
define gb_LinkTarget__use_cairo
+$(call gb_LinkTarget_use_package,$(1),cairo)
+$(call gb_LinkTarget_use_package,$(1),pixman)
$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,cairo) \
-I$(call gb_UnpackedTarball_get_dir,cairo)/src \
$(FREETYPE_CFLAGS) \
$$(INCLUDE) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
