From: Khem Raj <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 6/8] pax: Fix build with glibc 2.25
Date: Sun, 18 Dec 2016 19:05:58 -0800 [thread overview]
Message-ID: <20161219030600.1284-6-raj.khem@gmail.com> (raw)
In-Reply-To: <20161219030600.1284-1-raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...s-sysmacros.h-for-major-minor-definitions.patch | 71 ++++++++++++++++++++++
meta/recipes-extended/pax/pax_3.4.bb | 4 +-
2 files changed, 74 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
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..c9752e40fc
--- /dev/null
+++ b/meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
@@ -0,0 +1,71 @@
+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(-)
+
+diff --git a/src/cpio.c b/src/cpio.c
+index ed4dc48..ba2f14a 100644
+--- a/src/cpio.c
++++ b/src/cpio.c
+@@ -36,7 +36,7 @@
+ #include "config.h"
+ #endif
+
+-#include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+diff --git a/src/gen_subs.c b/src/gen_subs.c
+index 1898125..f9acbce 100644
+--- a/src/gen_subs.c
++++ b/src/gen_subs.c
+@@ -37,7 +37,7 @@
+ #include "config.h"
+ #endif
+
+-#include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+diff --git a/src/tar.c b/src/tar.c
+index aa11cd2..24d2c4a 100644
+--- a/src/tar.c
++++ b/src/tar.c
+@@ -37,7 +37,7 @@
+ #include "config.h"
+ #endif
+
+-#include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+--
+1.9.1
+
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 "
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://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 \
file://0001-use-strtoll-instead-of-strtoq.patch \
--
2.11.0
next prev parent reply other threads:[~2016-12-19 3:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-19 3:05 [PATCH 1/8] webkitgtk: Fix atomic detection on arm architecture Khem Raj
2016-12-19 3:05 ` [PATCH 2/8] gdb: Upgrade to 7.12 Khem Raj
2016-12-19 3:05 ` [PATCH 3/8] grub: Fix build with glibc 2.25 Khem Raj
2016-12-19 3:05 ` [PATCH 4/8] grub-git: Upgrade to tip of master and fix " Khem Raj
2016-12-19 3:05 ` [PATCH 5/8] mdadm: Fix build " Khem Raj
2016-12-19 3:05 ` Khem Raj [this message]
2016-12-19 3:05 ` [PATCH 7/8] x264: Fix build on mips architectures Khem Raj
2016-12-19 10:30 ` André Draszik
2016-12-19 3:06 ` [PATCH 8/8] autoconf: Fix AC_HEADER_MAJOR with glibc 2.25 Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161219030600.1284-6-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox