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/InstallModule_ooo.mk | |
| 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/InstallModule_ooo.mk')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 |
1 files changed, 1 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 \ |