aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-08-22 19:25:46 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-09-10 23:00:33 +0200
commitfc3969f63bda343c38c40a23f746c560c4735f3e (patch)
tree12dd59a6855e27145cb3fa17d943b0a2cfbff2e9
parentcaa61eb1a4c744be0727a7997b975378cb33f6a9 (diff)
firefox: add nss libraries to PRIVATE_LIBS and add dependency on external nss, nspr
* fixes following warnings and makes shlibs providers for nss libs more deterministic WARNING: firefox-10.0.11esr is already registered as shlib provider for libfreebl3.so, ignoring nss-3.13.3 trying to register the same WARNING: firefox-10.0.11esr is already registered as shlib provider for libnss3.so, ignoring nss-3.13.3 trying to register the same WARNING: firefox-10.0.11esr is already registered as shlib provider for libnssckbi.so, ignoring nss-3.13.3 trying to register the same WARNING: firefox-10.0.11esr is already registered as shlib provider for libsmime3.so, ignoring nss-3.13.3 trying to register the same WARNING: firefox-10.0.11esr is already registered as shlib provider for libnssutil3.so, ignoring nss-3.13.3 trying to register the same WARNING: firefox-10.0.11esr is already registered as shlib provider for libnssdbm3.so, ignoring nss-3.13.3 trying to register the same WARNING: firefox-10.0.11esr is already registered as shlib provider for libssl3.so, ignoring nss-3.13.3 trying to register the same WARNING: firefox-10.0.11esr is already registered as shlib provider for libsoftokn3.so, ignoring nss-3.13.3 trying to register the same Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-mozilla/firefox/firefox_10.0.11esr.bb14
1 files changed, 13 insertions, 1 deletions
diff --git a/recipes-mozilla/firefox/firefox_10.0.11esr.bb b/recipes-mozilla/firefox/firefox_10.0.11esr.bb
index 0774bb7..1a1178c 100644
--- a/recipes-mozilla/firefox/firefox_10.0.11esr.bb
+++ b/recipes-mozilla/firefox/firefox_10.0.11esr.bb
@@ -2,7 +2,7 @@
# Released under the MIT license (see packages/COPYING)
DESCRIPTION ?= "Browser made by mozilla"
-DEPENDS += "alsa-lib curl startup-notification libevent cairo libnotify libvpx virtual/libgl"
+DEPENDS += "alsa-lib curl startup-notification libevent cairo libnotify libvpx virtual/libgl nss nspr"
LICENSE = "MPLv1 | GPLv2+ | LGPLv2.1+"
LIC_FILES_CHKSUM = "file://toolkit/content/license.html;endline=39;md5=9cb02f27e77e702043b827c9418bfbf8"
@@ -138,3 +138,15 @@ PRIVATE_LIBS = "libmozjs.so \
libmozalloc.so \
libplc4.so \
libplds4.so"
+
+# mark libraries also provided by nss as private too
+PRIVATE_LIBS += " \
+ libfreebl3.so \
+ libnss3.so \
+ libnssckbi.so \
+ libsmime3.so \
+ libnssutil3.so \
+ libnssdbm3.so \
+ libssl3.so \
+ libsoftokn3.so \
+"