[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - ucb/Library_ucpdav1.mk

Tor Lillqvist tml at collabora.com
Fri Apr 4 03:17:17 PDT 2014


 ucb/Library_ucpdav1.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 670c81edfcc7c5c004925d1e5362f107bf641a3a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 4 13:15:50 2014 +0300

    libapr needs -liconv on OS X
    
    Change-Id: Ic1f24d534779c8a04a8a27be70541693f0892b02

diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 46777de..81046e4 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
 
 $(eval $(call gb_Library_add_libs,ucpdav1,\
 	$(if $(filter $(OS),LINUX),-lpthread -ldl) \
+	$(if $(filter $(OS),MACOSX),-liconv) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,ucpdav1,\


More information about the Libreoffice-commits mailing list