summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-19 19:31:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-11 16:59:18 +0100
commit39bf88ed40b196b8eb7a419eee984a3f730dc78c (patch)
tree07a3aea5b275c72e718aa1ce949f117720c7e343 /meta/recipes-extended
parent25c51395933e441c804fc18ffbd503a94a548f47 (diff)
downloadpoky-39bf88ed40b196b8eb7a419eee984a3f730dc78c.tar.gz
pax: Fix build with gcc7
(From OE-Core rev: 9c222c25e6a8b0414eee3e5f2e7c018b0c51ca4f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch38
-rw-r--r--meta/recipes-extended/pax/pax_3.4.bb9
2 files changed, 43 insertions, 4 deletions
diff --git a/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch b/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch
new file mode 100644
index 0000000000..b76f85aa45
--- /dev/null
+++ b/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch
@@ -0,0 +1,38 @@
1From e67bb3debe582f0e77770b714bd012bb1082fc41 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 19 Apr 2017 11:32:00 -0700
4Subject: [PATCH] Add a comment for fallthrough
5
6Fixes warnings with gcc7 e.g.
7
8../../../../../../../workspace/sources/pax/src/options.c: In function 'tar_options':
9../../../../../../../workspace/sources/pax/src/options.c:725:7: error: this statement may fall through [-Werror=implicit-fallthrough=]
10 if (opt_add ("write_opt=nodir") < 0)
11 ^
12../../../../../../../workspace/sources/pax/src/options.c:730:2: note: here
13 case 'O':
14 ^~~~
15cc1: all warnings being treated as errors
16
17Upstream-Status: Pending
18
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 src/options.c | 1 +
22 1 file changed, 1 insertion(+)
23
24diff --git a/src/options.c b/src/options.c
25index c663b4e..b80819a 100644
26--- a/src/options.c
27+++ b/src/options.c
28@@ -724,6 +724,7 @@ tar_options (int argc, char **argv)
29 case 'o':
30 if (opt_add ("write_opt=nodir") < 0)
31 tar_usage ();
32+ /* fallthru */
33 case 'O':
34 Oflag = 1;
35 break;
36--
372.12.2
38
diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/meta/recipes-extended/pax/pax_3.4.bb
index 9b4e17b3df..6df9a8186b 100644
--- a/meta/recipes-extended/pax/pax_3.4.bb
+++ b/meta/recipes-extended/pax/pax_3.4.bb
@@ -15,10 +15,11 @@ PR = "r2"
15DEPENDS_append_libc-musl = " fts " 15DEPENDS_append_libc-musl = " fts "
16 16
17SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2 \ 17SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2 \
18 file://fix_for_compile_with_gcc-4.6.0.patch \ 18 file://fix_for_compile_with_gcc-4.6.0.patch \
19 file://pax-3.4_fix_for_x32.patch \ 19 file://pax-3.4_fix_for_x32.patch \
20 file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \ 20 file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \
21" 21 file://0001-Add-a-comment-for-fallthrough.patch \
22 "
22 23
23SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \ 24SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \
24 file://0001-use-strtoll-instead-of-strtoq.patch \ 25 file://0001-use-strtoll-instead-of-strtoq.patch \