diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 23 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 12 |
3 files changed, 4 insertions, 35 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3455170e0e04..54d4cb0fa5e5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3003,6 +3003,10 @@ endef else # !SYSTEM_NSS +$(eval $(call gb_Helper_register_packages_for_install,ooo, \ + nss \ +)) + define gb_LinkTarget__use_nss3 $(call gb_LinkTarget_use_package,$(1),nss) $(call gb_LinkTarget_set_include,$(1),\ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a6d80c1e4f3f..6703125ff6d1 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -166,29 +166,6 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp ) #if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building //we need the nss libs for libxmlsec (or if the internal mozilla is enabled) -#ifndef SYSTEM_NSS -SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3) -SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3) -SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4) -SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3) -SPECIAL_LIB_FILE(gid_File_Lib_Nssutil3,nssutil3) -SPECIAL_LIB_FILE(gid_File_Lib_Nssckbi,nssckbi) -SPECIAL_LIB_FILE(gid_File_Lib_Plc4,plc4) -SPECIAL_LIB_FILE(gid_File_Lib_Plds4,plds4) -SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3) -SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3) -#ifdef WNT -SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3) -#else -#if !defined(MACOSX) -File gid_File_Lib_Sqlite3 - Name = SPECIAL_NAME(sqlite3); - PACKED_LIB_FILE_BODY; -End -#endif //!defined(MACOSX) -#endif //WNT -SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3) -#endif //SYSTEM_NSS File gid_File_Lib_XSec_XmlSec PACKED_LIB_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index c937482cb986..40a6e8d144b4 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -165,18 +165,6 @@ Module gid_Module_Root_Files_5 gid_Unixlink_File_Lib_Raptor, gid_Unixlink_File_Lib_Rasqal, gid_Unixlink_File_Lib_Rdf, - gid_File_Lib_Freebl3, - gid_File_Lib_Nss3, - gid_File_Lib_Nspr, - gid_File_Lib_Nssdbm3, - gid_File_Lib_Nssutil3, - gid_File_Lib_Nssckbi, - gid_File_Lib_Plc4, - gid_File_Lib_Plds4, - gid_File_Lib_Softokn3, - gid_File_Lib_Smime3, - gid_File_Lib_Sqlite3, - gid_File_Lib_Ssl3, gid_File_Lib_Sndfile, gid_File_Lib_Neon, gid_Unixlink_File_Lib_Xslt, |