Message ID | 20211017185415.1407474-1-fontaine.fabrice@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/1] package/util-linux: fix libuuid build | expand |
Fabrice, All, On 2021-10-17 20:54 +0200, Fabrice Fontaine spake thusly: > 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@gmail.com> > --- > ...nclude-c-h-to-cover-restrict-keyword.patch | 30 +++++++++++++++++++ > ...nclude-c-h-to-cover-restrict-keyword.patch | 30 +++++++++++++++++++ > 2 files changed, 60 insertions(+) > create mode 100644 package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch > create mode 100644 package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch I've make the util-libux-libs patch a symlink to the util-linux patch, like we have for the hash file. Applied to master, thanks. Regards, Yann E. MORIN. > 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@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@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@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 100644 > index 0000000000..3b4f510920 > --- /dev/null > +++ b/package/util-linux/util-linux-libs/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@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@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@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 > + > -- > 2.33.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
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@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@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@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 100644 index 0000000000..3b4f510920 --- /dev/null +++ b/package/util-linux/util-linux-libs/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@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@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@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 +
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@gmail.com> --- ...nclude-c-h-to-cover-restrict-keyword.patch | 30 +++++++++++++++++++ ...nclude-c-h-to-cover-restrict-keyword.patch | 30 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch create mode 100644 package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch