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>
This commit is contained in:
parent
0cc22efe40
commit
f87751165d
|
@ -0,0 +1,65 @@
|
||||||
|
From 7f4f379f8343c0ce92aa30f3f9037288a089a902 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sun, 18 Dec 2016 08:24:56 +0000
|
||||||
|
Subject: [PATCH] include <sys/sysmacros.h> for major/minor definitions
|
||||||
|
|
||||||
|
glibc 2.25 will error out if the applications are expecting
|
||||||
|
this to come from sys/types.h, it is being removed from
|
||||||
|
there.
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
|
||||||
|
error: In the GNU C Library, "minor" is defined
|
||||||
|
| by <sys/sysmacros.h>. For historical compatibility, it is
|
||||||
|
| currently defined by <sys/types.h> as well, but we plan to
|
||||||
|
| remove this soon. To use "minor", include <sys/sysmacros.h>
|
||||||
|
| directly. If you did not intend to use a system-defined macro
|
||||||
|
| "minor", you should undefine it after including <sys/types.h>. [-Werror]
|
||||||
|
| ul_oct ((u_long) MINOR (arcn->sb.st_rdev), hd->devminor,
|
||||||
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
src/cpio.c | 2 +-
|
||||||
|
src/gen_subs.c | 2 +-
|
||||||
|
src/tar.c | 2 +-
|
||||||
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
Index: pax-3.4/src/cpio.c
|
||||||
|
===================================================================
|
||||||
|
--- pax-3.4.orig/src/cpio.c
|
||||||
|
+++ pax-3.4/src/cpio.c
|
||||||
|
@@ -36,6 +36,7 @@
|
||||||
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
Index: pax-3.4/src/gen_subs.c
|
||||||
|
===================================================================
|
||||||
|
--- pax-3.4.orig/src/gen_subs.c
|
||||||
|
+++ pax-3.4/src/gen_subs.c
|
||||||
|
@@ -37,6 +37,7 @@
|
||||||
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
Index: pax-3.4/src/tar.c
|
||||||
|
===================================================================
|
||||||
|
--- pax-3.4.orig/src/tar.c
|
||||||
|
+++ pax-3.4/src/tar.c
|
||||||
|
@@ -37,6 +37,7 @@
|
||||||
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/stat.h>
|
|
@ -16,7 +16,9 @@ DEPENDS_append_libc-musl = " fts "
|
||||||
|
|
||||||
SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2 \
|
SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2 \
|
||||||
file://fix_for_compile_with_gcc-4.6.0.patch \
|
file://fix_for_compile_with_gcc-4.6.0.patch \
|
||||||
file://pax-3.4_fix_for_x32.patch"
|
file://pax-3.4_fix_for_x32.patch \
|
||||||
|
file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \
|
||||||
|
"
|
||||||
|
|
||||||
SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \
|
SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \
|
||||||
file://0001-use-strtoll-instead-of-strtoq.patch \
|
file://0001-use-strtoll-instead-of-strtoq.patch \
|
||||||
|
|
Loading…
Reference in New Issue