[Buildroot] [git commit] package/util-linux: fix libuuid build

Yann E. MORIN yann.morin.1998 at free.fr
Sun Oct 17 19:33:37 UTC 2021


commit: https://git.buildroot.net/buildroot/commit/?id=1b4fc24d656e157b03bd9ef844320ea99494bafe
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Fix the following build failure raised since bump to version 2.37.2 in
commit 27a46793b1a0c6c13c00b07d07bd5743e2c9c7b6 and
https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=33b09aebf505acfbbb2137319093fbb9ed7eea7d

libuuid/src/unparse.c:42:73: error: expected ';', ',' or ')' before 'fmt'
 static void uuid_fmt(const uuid_t uuid, char *buf, char const *restrict fmt)
                                                                         ^

Fixes:
 - http://autobuild.buildroot.org/results/b931a34a47e5faf8ae48fce079747dea0db2563a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
[yann.morin.1998 at free.fr: use symlink for util-linux-libs patch]
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
---
 ...uid-include-c-h-to-cover-restrict-keyword.patch | 30 ++++++++++++++++++++++
 ...uid-include-c-h-to-cover-restrict-keyword.patch |  1 +
 2 files changed, 31 insertions(+)

diff --git a/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch b/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch
new file mode 100644
index 0000000000..3b4f510920
--- /dev/null
+++ b/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch
@@ -0,0 +1,30 @@
+From 5f9b88f43ba7f98f81bde3538d5f4e5cd1a6c01c Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at redhat.com>
+Date: Thu, 5 Aug 2021 09:46:21 +0200
+Subject: libuuid: include c.h to cover restrict keyword
+
+References: https://github.com/karelzak/util-linux/issues/1405
+Signed-off-by: Karel Zak <kzak at redhat.com>
+
+[Retrieved from:
+https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=5f9b88f43ba7f98f81bde3538d5f4e5cd1a6c01c]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
+---
+ libuuid/src/unparse.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libuuid/src/unparse.c b/libuuid/src/unparse.c
+index f9a5e4315..ffeed2ed6 100644
+--- a/libuuid/src/unparse.c
++++ b/libuuid/src/unparse.c
+@@ -33,6 +33,7 @@
+  */
+ 
+ #include <stdio.h>
++#include "c.h"
+ 
+ #include "uuidP.h"
+ 
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch b/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch
new file mode 120000
index 0000000000..beecc3a48f
--- /dev/null
+++ b/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch
@@ -0,0 +1 @@
+../0001-libuuid-include-c-h-to-cover-restrict-keyword.patch
\ No newline at end of file


More information about the buildroot mailing list