diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-01-02 21:56:30 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-02 21:56:47 +0100 |
| commit | ebaaefcbf34d037aa8091ffbef3b7f8adc7a9ac5 (patch) | |
| tree | f540c666b35a3b979c8a756296872e8b63f3484b /nss | |
| parent | 79f1ef44e77074d8f5a1d32e0447118e5b9c4e70 (diff) | |
try to sort out libsqlite3 handling in nss
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/ExternalPackage_nss.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk index ce19727533e4..6f106af06bf6 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: |