Skip to content

C
core
Kaydet (Commit) ebaaefcb authored tarafından Luboš Luňák's avatar Luboš Luňák
Dosyalara gözat
Seçenekler

try to sort out libsqlite3 handling in nss

üst 79f1ef44
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
nss/ExternalPackage_nss.mk
Dosyayı görüntüle @ ebaaefcb
...@@ -29,9 +29,11 @@ $(eval $(call gb_ExternalPackage_add_files,nss,lib,\ ...@@ -29,9 +29,11 @@ $(eval $(call gb_ExternalPackage_add_files,nss,lib,\
mozilla/dist/out/lib/libplds4.dylib \ mozilla/dist/out/lib/libplds4.dylib \
mozilla/dist/out/lib/libsmime3.dylib \ mozilla/dist/out/lib/libsmime3.dylib \
mozilla/dist/out/lib/libsoftokn3.dylib \ mozilla/dist/out/lib/libsoftokn3.dylib \
mozilla/dist/out/lib/libsqlite3.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,\
...@@ -86,9 +88,11 @@ $(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/libplds4.so \
mozilla/dist/out/lib/libsmime3.so \ mozilla/dist/out/lib/libsmime3.so \
mozilla/dist/out/lib/libsoftokn3.so \ mozilla/dist/out/lib/libsoftokn3.so \
mozilla/dist/out/lib/libsqlite3.so \
mozilla/dist/out/lib/libssl3.so \ mozilla/dist/out/lib/libssl3.so \
)) ))
$(eval $(call gb_ExternalPackage_add_files,nss,lib/sqlite,\
mozilla/dist/out/lib/libsqlite3.so \
))
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
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