mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
From 26d01bdb26f1c7487ad4ba0151221dfe28cd878d Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
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 <fontaine.fabrice@gmail.com>
|
||||
[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
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Locally computed
|
||||
sha256 7a6e1dad34054b35e2e847eb3289be8820a5d378228802239852f913c6dcf6a7 zstd-1.4.2.tar.gz
|
||||
# From https://github.com/facebook/zstd/releases/download/v1.4.5/zstd-1.4.5.tar.gz.sha256
|
||||
sha256 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e zstd-1.4.5.tar.gz
|
||||
|
||||
# License files (locally computed as well)
|
||||
sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE
|
||||
sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING
|
||||
sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE
|
||||
sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ZSTD_VERSION = 1.4.2
|
||||
ZSTD_SITE = $(call github,facebook,zstd,v$(ZSTD_VERSION))
|
||||
ZSTD_VERSION = 1.4.5
|
||||
ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION)
|
||||
ZSTD_INSTALL_STAGING = YES
|
||||
ZSTD_LICENSE = BSD-3-Clause or GPL-2.0
|
||||
ZSTD_LICENSE_FILES = LICENSE COPYING
|
||||
@@ -71,7 +71,7 @@ endef
|
||||
# note: no 'HAVE_...' options for host library build only
|
||||
define HOST_ZSTD_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
|
||||
-C $(@D)/lib
|
||||
-C $(@D)/lib libzstd.a libzstd
|
||||
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
|
||||
-C $(@D) zstd
|
||||
endef
|
||||
|
||||
Reference in New Issue
Block a user