[Libreoffice-commits] .: nss/ExternalPackage_nss.mk

Wed Jan 2 12:57:07 PST 2013

nss/ExternalPackage_nss.mk |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit ebaaefcbf34d037aa8091ffbef3b7f8adc7a9ac5
Author: LuboÅ¡ LuÅˆÃ¡k <l.lunak at suse.cz>
Date:   Wed Jan 2 21:56:30 2013 +0100

    try to sort out libsqlite3 handling in nss

diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk
index ce19727..6f106af 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/nss/ExternalPackage_nss.mk
@@ -29,9 +29,11 @@ $(eval $(call gb_ExternalPackage_add_files,nss,lib,\
 		mozilla/dist/out/lib/libplds4.dylib \
 		mozilla/dist/out/lib/libsmime3.dylib \
 		mozilla/dist/out/lib/libsoftokn3.dylib \
-		mozilla/dist/out/lib/libsqlite3.dylib \
 		mozilla/dist/out/lib/libssl3.dylib \
 ))
+$(eval $(call gb_ExternalPackage_add_files,nss,lib/sqlite,\
+	        $(if $(filter 1060 1070 1080,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,mozilla/dist/out/lib/libsqlite3.dylib) \
+))
 else ifeq ($(OS),WNT)
 ifeq ($(COM),MSC)
 $(eval $(call gb_ExternalPackage_add_files,nss,lib,\
@@ -86,9 +88,11 @@ $(eval $(call gb_ExternalPackage_add_files,nss,lib,\
 		mozilla/dist/out/lib/libplds4.so \
 		mozilla/dist/out/lib/libsmime3.so \
 		mozilla/dist/out/lib/libsoftokn3.so \
-		mozilla/dist/out/lib/libsqlite3.so \
 		mozilla/dist/out/lib/libssl3.so \
 ))
+$(eval $(call gb_ExternalPackage_add_files,nss,lib/sqlite,\
+	        mozilla/dist/out/lib/libsqlite3.so \
+))
 endif
 
 # vim: set noet sw=4 ts=4:
