summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-12-18 22:39:53 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-20 15:22:16 +0000
commitf87751165deb58b2e4f967e1b0da7cd3853fcbff (patch)
treef605e87d84496e7fb9c1dd59ef67f4f86426bf87 /meta/recipes-extended
parent0cc22efe40567ac629c79044fe8b2439a7771ae9 (diff)
downloadpoky-f87751165deb58b2e4f967e1b0da7cd3853fcbff.tar.gz
pax: Fix build with glibc 2.25
(From OE-Core rev: fa7dd6977c1291467f7d209469b9d54371460f62) Signed-off-by: Khem Raj <raj.khem@gmail.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-include-sys-sysmacros.h-for-major-minor-definitions.patch65
-rw-r--r--meta/recipes-extended/pax/pax_3.4.bb4
2 files changed, 68 insertions, 1 deletions
diff --git a/meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch b/meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
new file mode 100644
index 0000000000..1d969bc34a
--- /dev/null
+++ b/meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
@@ -0,0 +1,65 @@
1From 7f4f379f8343c0ce92aa30f3f9037288a089a902 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 18 Dec 2016 08:24:56 +0000
4Subject: [PATCH] include <sys/sysmacros.h> for major/minor definitions
5
6glibc 2.25 will error out if the applications are expecting
7this to come from sys/types.h, it is being removed from
8there.
9
10Fixes
11
12error: In the GNU C Library, "minor" is defined
13| by <sys/sysmacros.h>. For historical compatibility, it is
14| currently defined by <sys/types.h> as well, but we plan to
15| remove this soon. To use "minor", include <sys/sysmacros.h>
16| directly. If you did not intend to use a system-defined macro
17| "minor", you should undefine it after including <sys/types.h>. [-Werror]
18| ul_oct ((u_long) MINOR (arcn->sb.st_rdev), hd->devminor,
19| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22---
23Upstream-Status: Pending
24
25 src/cpio.c | 2 +-
26 src/gen_subs.c | 2 +-
27 src/tar.c | 2 +-
28 3 files changed, 3 insertions(+), 3 deletions(-)
29
30Index: pax-3.4/src/cpio.c
31===================================================================
32--- pax-3.4.orig/src/cpio.c
33+++ pax-3.4/src/cpio.c
34@@ -36,6 +36,7 @@
35 #include "config.h"
36 #endif
37
38+#include <sys/sysmacros.h>
39 #include <sys/types.h>
40 #include <sys/time.h>
41 #include <sys/stat.h>
42Index: pax-3.4/src/gen_subs.c
43===================================================================
44--- pax-3.4.orig/src/gen_subs.c
45+++ pax-3.4/src/gen_subs.c
46@@ -37,6 +37,7 @@
47 #include "config.h"
48 #endif
49
50+#include <sys/sysmacros.h>
51 #include <sys/types.h>
52 #include <sys/time.h>
53 #include <sys/stat.h>
54Index: pax-3.4/src/tar.c
55===================================================================
56--- pax-3.4.orig/src/tar.c
57+++ pax-3.4/src/tar.c
58@@ -37,6 +37,7 @@
59 #include "config.h"
60 #endif
61
62+#include <sys/sysmacros.h>
63 #include <sys/types.h>
64 #include <sys/time.h>
65 #include <sys/stat.h>
diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/meta/recipes-extended/pax/pax_3.4.bb
index 9d1abfbb54..9b4e17b3df 100644
--- a/meta/recipes-extended/pax/pax_3.4.bb
+++ b/meta/recipes-extended/pax/pax_3.4.bb
@@ -16,7 +16,9 @@ DEPENDS_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 \
21"
20 22
21SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \ 23SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \
22 file://0001-use-strtoll-instead-of-strtoq.patch \ 24 file://0001-use-strtoll-instead-of-strtoq.patch \