Kaydet (Commit) 48e590c9 authored tarafından Michael Stahl's avatar Michael Stahl

nss: stop delivering libsqlite on Mac

Change-Id: I90fcfb9f5fe62eb394359716d0ae96b216f2e07e
üst 2bcb5f5c
...@@ -30,9 +30,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\ ...@@ -30,9 +30,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
mozilla/dist/out/lib/libsoftokn3.dylib \ mozilla/dist/out/lib/libsoftokn3.dylib \
mozilla/dist/out/lib/libssl3.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) else ifeq ($(OS),WNT)
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_files,nss,lib,\ $(eval $(call gb_ExternalPackage_add_files,nss,lib,\
......
...@@ -61,14 +61,13 @@ The direct link: ...@@ -61,14 +61,13 @@ The direct link:
== libsqlite3 == == libsqlite3 ==
The problem described here was found on Mac with OS 10.6 The system sqlite in Mac OS X versions older than 10.6 is incompatible
NSS cannot use the system sqlite on Mac because the base line is still MacOS with the softokn3 in nss which requires a later version of sqlite.
10.4. That system sqlite is incompatible with the softokn3 in nss which requires Since the baseline is Mac OS X 10.6 we use
a later version of sqlite.
When we used a more current Mac SDK then we could set
NSS_USE_SYSTEM_SQLITE=1 NSS_USE_SYSTEM_SQLITE=1
to build using the system sqlite. 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 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 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 tools if they use system libraries which are linked with the system
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment