[Libreoffice-commits] core.git: download.lst libcdr/ExternalProject_libcdr.mk

[Fridrich Å trba]

 download.lst                     |    4 ++--
 libcdr/ExternalProject_libcdr.mk |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4757ffcc5cea1d627f57e551b7af0b39c8e40b47
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Apr 22 14:58:58 2013 +0200

    Uploading LGM2013 version of libcdr
    
    Change-Id: Icdf57cb8a40256b4a474ededd3ba030bd79497f4

diff --git a/download.lst b/download.lst
index 7d79b71..fe61f6f 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-CDR_MD5SUM := 6db2c96a4ae5977da8b84893c1441038
-export CDR_TARBALL := libcdr-0.0.12.tar.bz2
+CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00
+export CDR_TARBALL := libcdr-0.0.13.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
 MWAW_MD5SUM := 7c08542921466eee797e0be23e9535b3
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index e3470f4..c6b8347 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\
 ))
 
 $(eval $(call gb_ExternalProject_use_externals,libcdr,\
+	boost_headers \
 	icu \
 	lcms2 \
 	wpd \
@@ -39,6 +40,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 			--without-docs \
 			--disable-debug \
 			--disable-werror \
+			CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
 	)