From: Gavin Schenk <g.schenk@eckelmann.de>
To: ptxdist@pengutronix.de
Cc: Gavin Schenk <g.schenk@eckelmann.de>
Subject: [ptxdist] [PATCH] squashfs-tools: Use sysmacros fixes build with glib >2.28
Date: Tue, 18 Dec 2018 11:32:32 +0100 [thread overview]
Message-ID: <20181218103232.25049-1-g.schenk@eckelmann.de> (raw)
Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
---
...sysmacros-fixes-build-with-glib-2.28.patch | 43 +++++++++++++++++++
patches/squashfs4.3/series | 4 ++
2 files changed, 47 insertions(+)
create mode 100644 patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch
create mode 100644 patches/squashfs4.3/series
diff --git a/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch
new file mode 100644
index 000000000..d43136581
--- /dev/null
+++ b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glib-2.28.patch
@@ -0,0 +1,43 @@
+From: Gavin Schenk <g.schenk@eckelmann.de>
+Date: Tue, 18 Dec 2018 11:19:47 +0100
+Subject: [PATCH] Use sysmacros fixes build with glib >2.28
+
+From the manpages major, minor, makedev:
+The BSDs expose the definitions for these macros via <sys/types.h>.
+Depending on the version, glibc also exposes definitions for these macros
+from that header file if suitable feature test macros are defined.
+However, this behavior was deprecated in glibc 2.25,
+and since glibc 2.28, <sys/types.h> no longer provides these definitions.
+
+Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
+---
+ squashfs-tools/mksquashfs.c | 2 +-
+ squashfs-tools/unsquashfs.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index 86f82bb92804..95528be8733c 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -33,7 +33,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stddef.h>
+-#include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
+diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
+index 1323dd6f2cb9..cb8bb193d268 100644
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -32,7 +32,7 @@
+ #include "stdarg.h"
+
+ #include <sys/sysinfo.h>
+-#include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <limits.h>
diff --git a/patches/squashfs4.3/series b/patches/squashfs4.3/series
new file mode 100644
index 000000000..6ea61897b
--- /dev/null
+++ b/patches/squashfs4.3/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Use-sysmacros-fixes-build-with-glib-2.28.patch
+# 86201a06abd18a6b9f0e983e9183d6ac - git-ptx-patches magic
--
2.19.2
--
Eckelmann AG
Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann
Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann
Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann
Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636
http://www.eckelmann.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2018-12-18 10:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-18 10:32 Gavin Schenk [this message]
2018-12-18 11:16 ` [ptxdist] [PATCH v2] " Gavin Schenk
2018-12-18 12:00 ` Ladislav Michl
2018-12-19 6:54 ` [ptxdist] [PATCH v3] squashfs-tools: Use sysmacros fixes build with glibc >= 2.28 Gavin Schenk
2018-12-19 7:04 ` [ptxdist] [PATCH v4] " Gavin Schenk
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=20181218103232.25049-1-g.schenk@eckelmann.de \
--to=g.schenk@eckelmann.de \
--cc=ptxdist@pengutronix.de \
/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