diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-05-11 10:35:14 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-13 13:41:29 +0100 |
commit | 40abaa622b370b273fdd86e297ff767f60e62c63 (patch) | |
tree | e686244300a568dd7a0b74ade878595b1a0f2e40 | |
parent | 6ab12ea4d1673d3dcfdc5940a9df0b809c3e2dd9 (diff) | |
download | poky-40abaa622b370b273fdd86e297ff767f60e62c63.tar.gz |
nss: Upgrade to 3.23
Disable Werror on native builds. This helps
in building nss-native on build hosts which have
gcc < 4.9 eg. ubuntu 14.04
The real issue is that we use headers from native
staging sysroot and it has the updated glibc headers
which then ends up with errors e.g.
| In function 'memset',
| inlined from 'sec_PKCS7Encrypt' at p7local.c:715:14:
| /usr/include/x86_64-linux-gnu/bits/string3.h:81:30: error: call to '__warn_memset_zero_len' declared with attribute warning: memset used with constant zero length parameter; this could be due to transposed parameters [-Werror]
| __warn_memset_zero_len ();
| ^
| cc1: all warnings being treated as errors
| make[2]: *** [Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/p7local.o] Error 1
(From OE-Core rev: e69feac4066c8c27b50c88daf9ebaa27a5c54646)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/nss/nss_3.23.bb (renamed from meta/recipes-support/nss/nss_3.21.bb) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-support/nss/nss_3.21.bb b/meta/recipes-support/nss/nss_3.23.bb index d2e24112de..2663ff7dba 100644 --- a/meta/recipes-support/nss/nss_3.21.bb +++ b/meta/recipes-support/nss/nss_3.23.bb | |||
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ | |||
15 | file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" | 15 | file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" |
16 | 16 | ||
17 | SRC_URI = "\ | 17 | SRC_URI = "\ |
18 | http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${BP}.tar.gz \ | 18 | http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_23_RTM/src/${BP}.tar.gz \ |
19 | file://nss-fix-support-cross-compiling.patch \ | 19 | file://nss-fix-support-cross-compiling.patch \ |
20 | file://nss-no-rpath-for-cross-compiling.patch \ | 20 | file://nss-no-rpath-for-cross-compiling.patch \ |
21 | file://nss-fix-incorrect-shebang-of-perl.patch \ | 21 | file://nss-fix-incorrect-shebang-of-perl.patch \ |
@@ -24,9 +24,8 @@ SRC_URI = "\ | |||
24 | file://nss.pc.in \ | 24 | file://nss.pc.in \ |
25 | file://signlibs.sh \ | 25 | file://signlibs.sh \ |
26 | " | 26 | " |
27 | 27 | SRC_URI[md5sum] = "21c3fed84441b2ab4c50ac626f6517e7" | |
28 | SRC_URI[md5sum] = "3c8b2ed880dd3a8d86c9e0151afe6eba" | 28 | SRC_URI[sha256sum] = "94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf" |
29 | SRC_URI[sha256sum] = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239" | ||
30 | 29 | ||
31 | UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" | 30 | UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" |
32 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" | 31 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" |
@@ -49,6 +48,7 @@ do_configure_prepend_libc-musl () { | |||
49 | do_compile_prepend_class-native() { | 48 | do_compile_prepend_class-native() { |
50 | export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE} | 49 | export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE} |
51 | export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} | 50 | export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} |
51 | export NSS_ENABLE_WERROR=0 | ||
52 | } | 52 | } |
53 | 53 | ||
54 | do_compile_prepend_class-nativesdk() { | 54 | do_compile_prepend_class-nativesdk() { |