[Libreoffice-commits] core.git: nss/ExternalPackage_nss.mk nss/README

[Michael Stahl]

 nss/ExternalPackage_nss.mk |    3 ---
 nss/README                 |    9 ++++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 48e590c9a95339d2ad8ef6cbaeac422223d57aad
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 22 15:24:51 2013 +0200

    nss: stop delivering libsqlite on Mac
    
    Change-Id: I90fcfb9f5fe62eb394359716d0ae96b216f2e07e

diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk
index c50a718..18211f2 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/nss/ExternalPackage_nss.mk
@@ -30,9 +30,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
 		mozilla/dist/out/lib/libsoftokn3.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,\
diff --git a/nss/README b/nss/README
index 18267eb..77bc817 100644
--- a/nss/README
+++ b/nss/README
@@ -61,14 +61,13 @@ The direct link:
 
 == libsqlite3 ==
 
-The problem described here was found on Mac with OS 10.6
-NSS cannot use the system sqlite on Mac because the base line is still MacOS
-10.4. That system sqlite is incompatible with the softokn3 in nss which requires
-a later version of sqlite.
-When we used a more current Mac SDK then we could set
+The system sqlite in Mac OS X versions older than 10.6 is incompatible
+with the softokn3 in nss which requires a later version of sqlite.
+Since the baseline is Mac OS X 10.6 we use
 NSS_USE_SYSTEM_SQLITE=1
 to build using the system sqlite.
 
+The problem described here was found on Mac with OS 10.6
 We cannot deliver sqlite in the lib directory of the solver. This directory is
 used by tools of the build environment. Using the sqlite from NSS breaks the
 tools if they use system libraries which are linked with the system