summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorGavin Schenk <g.schenk@eckelmann.de>2018-12-19 08:04:12 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-01-02 15:10:29 +0100
commitf8b10dce24680e78e92931fb04e431da9c2d89da (patch)
tree56fde9877042d03ed22f5478417fcb5f43d52251 /patches
parent1f6dbd39446b97f0188bad9d0b376bd91dd83133 (diff)
downloadptxdist-f8b10dce24680e78e92931fb04e431da9c2d89da.tar.gz
ptxdist-f8b10dce24680e78e92931fb04e431da9c2d89da.tar.xz
squashfs-tools: Use sysmacros fixes build with glibc >= 2.28
Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glibc-2.28.patch41
-rw-r--r--patches/squashfs4.3/series4
2 files changed, 45 insertions, 0 deletions
diff --git a/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glibc-2.28.patch b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glibc-2.28.patch
new file mode 100644
index 000000000..a8c4d6296
--- /dev/null
+++ b/patches/squashfs4.3/0001-Use-sysmacros-fixes-build-with-glibc-2.28.patch
@@ -0,0 +1,41 @@
+From: Gavin Schenk <g.schenk@eckelmann.de>
+Date: Tue, 18 Dec 2018 11:19:47 +0100
+Subject: [PATCH] Use sysmacros fixes build with glibc >= 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 | 1 +
+ squashfs-tools/unsquashfs.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index 86f82bb92804..84affd4be160 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -33,6 +33,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stddef.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
+index 1323dd6f2cb9..2633e0c0b7ef 100644
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -32,6 +32,7 @@
+ #include "stdarg.h"
+
+ #include <sys/sysinfo.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
diff --git a/patches/squashfs4.3/series b/patches/squashfs4.3/series
new file mode 100644
index 000000000..c66134800
--- /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-glibc-2.28.patch
+# 4b854e836f049da26f6a51c9c416871d - git-ptx-patches magic