[Libreoffice-commits] core.git: external/nss

[Douglas Mencken]

 external/nss/ExternalPackage_nss.mk |    1 +
 external/nss/ExternalProject_nss.mk |    3 ++-
 external/nss/README                 |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d2a48728617e00a91d1ad032bd11ab5bb556d15a
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Mon Feb 24 05:02:36 2014 -0500

    nss: continue delivering libsqlite on Mac OS X 10.5
    
    Change-Id: Ibfd47071c73fc5f6c48d268a1f00d7f52762d0f2
    Reviewed-on: https://gerrit.libreoffice.org/8204
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/nss/ExternalPackage_nss.mk b/external/nss/ExternalPackage_nss.mk
index ea686c2..e7e9e8a 100644
--- a/external/nss/ExternalPackage_nss.mk
+++ b/external/nss/ExternalPackage_nss.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
 		dist/out/lib/libsmime3.dylib \
 		dist/out/lib/libsoftokn3.dylib \
 		dist/out/lib/libssl3.dylib \
+		$(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),dist/out/lib/libsqlite3.dylib) \
 ))
 else ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 3a6a2bd..5d630be 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -60,9 +60,10 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \
 		$(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
-			NSS_USE_SYSTEM_SQLITE=1) \
+			$(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,NSS_USE_SYSTEM_SQLITE=1)) \
 		$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
 		$(if $(filter YES,$(CROSS_COMPILING)),\
+		$(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
 		NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \
 		NSDISTMODE=copy \
 		$(MAKE) -j1 AR="$(AR)" RANLIB="$(RANLIB)" NMEDIT="$(NM)edit" nss_build_all \
diff --git a/external/nss/README b/external/nss/README
index 77bc817..a6392fe 100644
--- a/external/nss/README
+++ b/external/nss/README
@@ -63,7 +63,7 @@ The direct link:
 
 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
+With SDK 10.6 (and more current SDK) we use
 NSS_USE_SYSTEM_SQLITE=1
 to build using the system sqlite.