diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-01-10 13:34:49 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-01-10 17:00:12 +0100 |
| commit | c3a3e52a087ad2c50eb724fc09901006ec66fce8 (patch) | |
| tree | 3a6f3d0695a7aa56a71519736b0cb4334217f57d | |
| parent | 90d8c9812fbaf05d05ca1424a800abff8a6f2082 (diff) | |
scp2: package new Linux-only libfreeblpriv3.so
This was added in NSS 3.24 in 488aed9f7c13b04813c3336379f06417f4cde8ab
and added to the ExternalPackage but in the 4.1 branch, that is not
sufficient, because that is not yet used for installation sets,
it needs to be added in scp2 explicitly.
Change-Id: I6134952bce4efe243305c156c738605cb296f5dc
Reviewed-on: https://gerrit.libreoffice.org/66091
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f353d45c3a5f..61328a578279 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -838,6 +838,9 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) //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) +#ifdef LINUX +SPECIAL_LIB_FILE(gid_File_Lib_Freeblpriv3,freeblpriv3) +#endif SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3) SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4) SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 696b47becae1..9026dfa54c20 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -230,6 +230,9 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Rdf, gid_Unixlink_File_Lib_Rdf, gid_File_Lib_Freebl3, +#ifdef LINUX + gid_File_Lib_Freeblpriv3, +#endif gid_File_Lib_Nss3, gid_File_Lib_Nspr, gid_File_Lib_Nssdbm3, |