diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-23 14:31:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 14:19:00 +0100 |
| commit | 423479cd751e6fe7436237890240b6c9674dec5d (patch) | |
| tree | c6883c46e795b20db8f08f758d2ea6cf37010235 /scp2 | |
| parent | 403bdf77473afaea60b80d212af19b8a1c08b876 (diff) | |
Resolves: fdo#51166 disconnect inclusion of nss libs in install from mozilla
We need the nss libs in our final install always (unless using system-nss libs)
so finally disentangle nss from mozilla because --disable-build-mozilla had the
sideeffect of *not* including the nss libraries in the final install. Which
means that the xml_xmlsec.dll on windows couldn't be loaded due to missing
dependencies.
a) Strip out the nss libs from the pre-builds if those are being used.
b) Strip out the nss libs from the mozilla build itself if that's being used.
c) Don't include the nss libs in the weird mozillaruntime.zip which gets unpacked
into the install.
d) Package the nss libs directly in scp2 like everything else
Change-Id: Ia89d75cb0c0b83e84e60d0444ffc7997103fbc55
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 31 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 12 |
3 files changed, 44 insertions, 0 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index b903a03963c8..a36be0514d25 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -76,6 +76,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_MOZILLA \ SYSTEM_MYTHES \ SYSTEM_NEON \ + SYSTEM_NSS \ SYSTEM_OPENSSL \ SYSTEM_PANGO \ SYSTEM_PORTAUDIO \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 6e5ec3f02d64..117f6d6242f8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1326,6 +1326,37 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) #endif #endif +#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 +/* + For MacOSX >= 10.6 we can apparently use the system sqlite. + + For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration + of the build to avoid #i106132#. Now we need to put it into the program dir of + the install. +*/ +#if !defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) +File gid_File_Lib_Sqlite3 + Name = "sqlite/" SPECIAL_NAME(sqlite3); + PACKED_LIB_FILE_BODY; +End +#endif +#endif +SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3) +#endif + SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1) SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 9c87d80883b0..a3ff86d9613c 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -408,6 +408,18 @@ Module gid_Module_Root_Files_5 gid_Unixlink_File_Lib_Rasqal, gid_File_Lib_Rdf, 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_Unordf, gid_File_Lib_Sndfile, gid_File_Lib_Tvhlp1, |