summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-04-16 15:04:37 +0200
committerKoen Kooi <koen@openembedded.org>2010-04-16 15:34:12 +0200
commit0a9a9e89cdce311456e3d90e73014ce08d7a810f (patch)
tree4878e38b89ac6968df98780be14910f65684685f
parent8fdfb4417be148bf9a07551ee31fe1c7e23abc4b (diff)
nss: more pkgconfig fixes...
-rw-r--r--recipes/mozilla/nss-3.12.6/nss.pc.in2
-rw-r--r--recipes/mozilla/nss-3.12/nss.pc.in2
-rw-r--r--recipes/mozilla/nss_3.12.6.bb2
-rw-r--r--recipes/mozilla/nss_3.12.bb2
4 files changed, 5 insertions, 3 deletions
diff --git a/recipes/mozilla/nss-3.12.6/nss.pc.in b/recipes/mozilla/nss-3.12.6/nss.pc.in
index ff29a1ed42..e72ee5f913 100644
--- a/recipes/mozilla/nss-3.12.6/nss.pc.in
+++ b/recipes/mozilla/nss-3.12.6/nss.pc.in
@@ -7,5 +7,5 @@ Name: NSS
Description: Mozilla Network Security Services
Version: @VERSION@
Requires: nspr
-Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3
+Libs: -L${libdir}/nss -lnss3 -lnssutil3 -lsmime3 -lssl3
Cflags: -I${includedir}
diff --git a/recipes/mozilla/nss-3.12/nss.pc.in b/recipes/mozilla/nss-3.12/nss.pc.in
index ff29a1ed42..55497e365d 100644
--- a/recipes/mozilla/nss-3.12/nss.pc.in
+++ b/recipes/mozilla/nss-3.12/nss.pc.in
@@ -7,5 +7,5 @@ Name: NSS
Description: Mozilla Network Security Services
Version: @VERSION@
Requires: nspr
-Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3
+Libs: -L${libdir}/nss -lnss3 -lnssutil3 -lsmime3 -lssl3
Cflags: -I${includedir}
diff --git a/recipes/mozilla/nss_3.12.6.bb b/recipes/mozilla/nss_3.12.6.bb
index 6634613085..7da316fb14 100644
--- a/recipes/mozilla/nss_3.12.6.bb
+++ b/recipes/mozilla/nss_3.12.6.bb
@@ -1,6 +1,8 @@
DESCRIPTION = "Mozilla's SSL and TLS implementation"
HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/"
+PR = "r1"
+
LICENSE = "MPL1.1 GPL LGPL"
DEPENDS = "sqlite3 nspr"
diff --git a/recipes/mozilla/nss_3.12.bb b/recipes/mozilla/nss_3.12.bb
index c7bc02baf8..a6408954cb 100644
--- a/recipes/mozilla/nss_3.12.bb
+++ b/recipes/mozilla/nss_3.12.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/"
LICENSE = "MPL1.1 GPL LGPL"
-PR = "r2"
+PR = "r3"
DEPENDS = "sqlite3 nspr"