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

[Kohei Yoshida]

 liborcus/ExternalProject_liborcus.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 631b0c56aa8a6f6b1154ca80b39d960a827ab2f3
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date:   Thu Apr 11 20:29:55 2013 -0400

    Fix linker error against system zlib.
    
    Not sure what we'll have to do with the internal zlib.  Not tested
    that scenario yet.
    
    Change-Id: Iec9e4f30b006ceaa2271156650b5ad922d4b40e4

diff --git a/liborcus/ExternalProject_liborcus.mk 
b/liborcus/ExternalProject_liborcus.mk
index 4be7040..ca98e8b 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -45,6 +45,7 @@ $(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) \
        )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits