diff options
author | Zeeshan Ali <zeeshanak@gnome.org> | 2016-11-14 10:40:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-18 13:14:19 +0100 |
commit | cef5f86f43415ce8ca720d62c3d3bb1cb8fadb74 (patch) | |
tree | c6c0a828f613d21cc59ee34bc616937c111ec86a /meta | |
parent | 1a2ec16ec031f6401bb60ca0e6514e71c335f987 (diff) | |
download | poky-cef5f86f43415ce8ca720d62c3d3bb1cb8fadb74.tar.gz |
nss: Disable warning on deprecated API usage
nss itself enables Werror if gcc is version 4.8 of greater, which fails
the build against new glibc (2.24) because of use of readdir_r(), which
is now deprecated. Let's just disable warnings on deprecated API usage.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10644
(From OE-Core rev: 6df5997bc0a7f7af73f625b172f99964cfed9f6e)
Signed-off-by: Zeeshan Ali <zeeshan.ali@pelagicore.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/nss/nss/nss-disable-werror-on-deprecated-api.patch | 22 | ||||
-rw-r--r-- | meta/recipes-support/nss/nss_3.21.bb | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/nss/nss-disable-werror-on-deprecated-api.patch b/meta/recipes-support/nss/nss/nss-disable-werror-on-deprecated-api.patch new file mode 100644 index 0000000000..fbaa6a6b97 --- /dev/null +++ b/meta/recipes-support/nss/nss/nss-disable-werror-on-deprecated-api.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Disable Werror on deprecated API | ||
2 | |||
3 | nss itself enables Werror if gcc is version 4.8 of greater, which fails | ||
4 | the build against new glibc (2.24) because of use of readdir_r(), which is | ||
5 | now deprecated. Let's just disable warnings on deprecated API usage. | ||
6 | |||
7 | Upstream-Status: Inappropriate [Dev branch on newer version w/o this issue] | ||
8 | |||
9 | Signed-off-by: Zeeshan Ali <zeeshan.ali@pelagicore.com> | ||
10 | =================================================== | ||
11 | diff -u -r a/nss/coreconf/Werror.mk b/nss/coreconf/Werror.mk | ||
12 | --- a/nss/coreconf/Werror.mk 2015-11-09 06:12:59.000000000 +0100 | ||
13 | +++ b/nss/coreconf/Werror.mk 2016-11-11 14:36:36.301062957 +0100 | ||
14 | @@ -60,7 +60,7 @@ | ||
15 | endif #ndef NSS_ENABLE_WERROR | ||
16 | |||
17 | ifeq ($(NSS_ENABLE_WERROR),1) | ||
18 | - WARNING_CFLAGS += -Werror | ||
19 | + WARNING_CFLAGS += -Werror -Wno-deprecated -Wno-deprecated-declarations | ||
20 | else | ||
21 | # Old versions of gcc (< 4.8) don't support #pragma diagnostic in functions. | ||
22 | # Use this to disable use of that #pragma and the warnings it suppresses. | ||
diff --git a/meta/recipes-support/nss/nss_3.21.bb b/meta/recipes-support/nss/nss_3.21.bb index 05d81c27e1..7933883a07 100644 --- a/meta/recipes-support/nss/nss_3.21.bb +++ b/meta/recipes-support/nss/nss_3.21.bb | |||
@@ -22,6 +22,7 @@ SRC_URI = "\ | |||
22 | file://nss-fix-nsinstall-build.patch \ | 22 | file://nss-fix-nsinstall-build.patch \ |
23 | file://0001-Fix-build-failure-on-opensuse-13.1.patch \ | 23 | file://0001-Fix-build-failure-on-opensuse-13.1.patch \ |
24 | file://nss-gcc6-fix.patch \ | 24 | file://nss-gcc6-fix.patch \ |
25 | file://nss-disable-werror-on-deprecated-api.patch \ | ||
25 | file://nss.pc.in \ | 26 | file://nss.pc.in \ |
26 | file://signlibs.sh \ | 27 | file://signlibs.sh \ |
27 | " | 28 | " |