Skip to contentSkip to conversation

package/zstd: fix build without st_mtime

PATCH New Fabrice Fontaine 3 participants 3 messages Jul 15, 2020 – Jul 22, 2020 Zstd

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/zstd: fix build without st_mtime

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

---
 ...ms-util.c-fix-build-without-st_mtime.patch | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch
package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch new file +40 -0
new file mode 100644
index 0000000000..0f735b8843
@@ -0,0 +1,40 @@
+From 26d01bdb26f1c7487ad4ba0151221dfe28cd878d Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Wed, 15 Jul 2020 21:19:14 +0200
+Subject: [PATCH] programs/util.c: fix build without st_mtime
+
+Since version 1.4.5 and commit
+5af8cb7aea8d890b4801e50e5274371510f2cf33, if st_mtime is not defined,
+programs/util.c uses utime without including utime.h which will raise
+the following build failure on some of the buildroot autobuilders:
+
+util.c: In function 'UTIL_setFileStat':
+util.c:161:24: error: storage size of 'timebuf' isn't known
+         struct utimbuf timebuf;
+                        ^~~~~~~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/be902c5d110f37bce622a2215191f155b7d3e7e0
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status: https://github.com/facebook/zstd/pull/2246]
+---
+ programs/util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/programs/util.c b/programs/util.c
+index a0d45745..2493a4ad 100644
+--- a/programs/util.c
++++ b/programs/util.c
+@@ -28,7 +28,7 @@ extern "C" {
+ #  include <io.h>         /* _chmod */
+ #else
+ #  include <unistd.h>     /* chown, stat */
+-#  if PLATFORM_POSIX_VERSION < 200809L
++#  if PLATFORM_POSIX_VERSION < 200809L || !defined(st_mtime)
+ #    include <utime.h>    /* utime */
+ #  else
+ #    include <fcntl.h>    /* AT_FDCWD */
+-- 
+2.27.0
+
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 package/zstd: fix build without st_mtime

Quoted 4 lines · On Wed, 15 Jul 2020 21:29:05 +0200 Fabrice Fontaine…

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

I've applied because the patch was merged upstream. However, I have one suggestion below.

Quoted 6 lines
package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch new file +0 -0
new file mode 100644
index 0000000000..0f735b8843

package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch line 9

Quoted 9 lines
package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch new file +9 -0
@@ -0,0 +1,40 @@
+From 26d01bdb26f1c7487ad4ba0151221dfe28cd878d Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Wed, 15 Jul 2020 21:19:14 +0200
+Subject: [PATCH] programs/util.c: fix build without st_mtime
+
+Since version 1.4.5 and commit
+5af8cb7aea8d890b4801e50e5274371510f2cf33, if st_mtime is not defined,
+programs/util.c uses utime without including utime.h which will raise
+the following build failure on some of the buildroot autobuilders:

I don't think "on some of the buildroot autobuilders" is a very good justification/explanation. Instead, the explanation should be "fails with the musl C library", "fails on architecture XYZ because it defines ABC differently".

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com