[Libreoffice-commits] core.git: Branch 'feature/orcus-update' - liborcus/ExternalPackage_liborcus.mk liborcus/ExternalProject_liborcus.mk

[Kohei Yoshida]

 liborcus/ExternalPackage_liborcus.mk |    1 +
 liborcus/ExternalProject_liborcus.mk |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fa481541df8c82c8b9537b7ad824b4740698d3f9
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Apr 11 22:40:31 2013 -0400

    Deliver another library, though sc still can't link to it.  Damn.
    
    Change-Id: I6a0193df0cdb82e1855c5ac2d38976c7fb29d039

diff --git a/liborcus/ExternalPackage_liborcus.mk b/liborcus/ExternalPackage_liborcus.mk
index d47e608..c2fd898 100644
--- a/liborcus/ExternalPackage_liborcus.mk
+++ b/liborcus/ExternalPackage_liborcus.mk
@@ -15,6 +15,7 @@ ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_ExternalPackage_add_file,liborcus,lib/orcus.lib,src/liborcus/.libs/liborcus-0.6.lib))
 else
 $(eval $(call gb_ExternalPackage_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.6.a))
+$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/liborcus-parser.a,src/parser/.libs/liborcus-parser-0.6.a))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index ca98e8b..b46180c 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\
 $(call gb_ExternalProject_get_state_target,liborcus,build) :
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \
+		$(if $(filter YES,$(SYSTEM_ZLIB)),LIBS+=-lz) \
 		./configure \
 			--with-pic \
 			--enable-static \
@@ -45,7 +46,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 			CXXFLAGS="$(BOOST_CXXFLAGS) $(if $(filter NO,$(SYSTEM_BOOST)),\
 			-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
 			$(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS=$(BOOST_LDFLAGS)) \
-			$(if $(filter YES,$(SYSTEM_ZLIB)),LIBS=-lz) \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)