diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-04-16 21:42:28 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-04-17 09:46:08 +0200 |
| commit | b304f79d96ae8519d341677f61e25a857f642a56 (patch) | |
| tree | 15db98b10e5a3425ff4271a86ac4d12d836b7808 /recipes/mozilla | |
| parent | 070002e18deb3f1c58c5ea3e76f44429348379ea (diff) | |
nss 3.12.6: the jalimo recipe was trying to be way to clever with shared libs, breaking dynamic linking at runtime, so simplify recipe
Diffstat (limited to 'recipes/mozilla')
| -rw-r--r-- | recipes/mozilla/nss-3.12.6/81_sonames.patch | 8 | ||||
| -rw-r--r-- | recipes/mozilla/nss-3.12.6/nss.pc.in | 2 | ||||
| -rw-r--r-- | recipes/mozilla/nss_3.12.6.bb | 11 |
3 files changed, 10 insertions, 11 deletions
diff --git a/recipes/mozilla/nss-3.12.6/81_sonames.patch b/recipes/mozilla/nss-3.12.6/81_sonames.patch index 5fceba3835..32fdca5c6c 100644 --- a/recipes/mozilla/nss-3.12.6/81_sonames.patch +++ b/recipes/mozilla/nss-3.12.6/81_sonames.patch @@ -309,7 +309,7 @@ index b3bbd97..a87a90c 100644 LIBRARY_NAME = nss LIBRARY_VERSION = 3 -+SO_VERSION = 1d ++SO_VERSION = 1oe # This part of the code, including all sub-dirs, can be optimized for size export ALLOW_OPT_CODE_SIZE = 1 @@ -321,7 +321,7 @@ index a72b413..a782e1d 100644 LIBRARY_NAME = smime LIBRARY_VERSION = 3 -+SO_VERSION = 1d ++SO_VERSION = 1oe # This part of the code, including all sub-dirs, can be optimized for size export ALLOW_OPT_CODE_SIZE = 1 @@ -333,7 +333,7 @@ index 8451229..ec3495e 100644 LIBRARY_NAME = ssl LIBRARY_VERSION = 3 -+SO_VERSION = 1d ++SO_VERSION = 1oe # This part of the code, including all sub-dirs, can be optimized for size export ALLOW_OPT_CODE_SIZE = 1 @@ -345,7 +345,7 @@ index 74ddd92..30f530a 100644 LIBRARY_NAME = nssutil LIBRARY_VERSION = 3 -+SO_VERSION = 1d ++SO_VERSION = 1oe # This part of the code, including all sub-dirs, can be optimized for size export ALLOW_OPT_CODE_SIZE = 1 diff --git a/recipes/mozilla/nss-3.12.6/nss.pc.in b/recipes/mozilla/nss-3.12.6/nss.pc.in index e72ee5f913..84e4ef779d 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}/nss -lnss3 -lnssutil3 -lsmime3 -lssl3 +Libs: -L${libdir} -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 7da316fb14..76ad318a7e 100644 --- a/recipes/mozilla/nss_3.12.6.bb +++ b/recipes/mozilla/nss_3.12.6.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Mozilla's SSL and TLS implementation" HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -PR = "r1" +PR = "r2" LICENSE = "MPL1.1 GPL LGPL" @@ -79,9 +79,10 @@ do_install() { install -d ${D}/${libdir}/nss - for shared_lib in ${TD}/${libdir}/*.so + for shared_lib in ${TD}/${libdir}/*.so.* do - cp $shared_lib ${D}/${libdir}/nss + cp $shared_lib ${D}/${libdir} + ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) done install -d ${D}/${includedir}/mozilla/nss @@ -89,7 +90,7 @@ do_install() { for static_lib in ${TD}/${libdir}/*.a do - oe_libinstall -C ${TD}/${libdir} `basename $static_lib .a` ${D}/${libdir}/nss + oe_libinstall -C ${TD}/${libdir} `basename $static_lib .a` ${D}/${libdir} done install -d ${D}/${bindir} @@ -103,5 +104,3 @@ do_install() { } -FILES_${PN} = "${bindir} ${libdir}/nss/*.so" -FILES_${PN}-static += "${libdir}/nss/*.a" |