Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zstd: Fix compilation with uClibc-ng

Browse source 
Upstream backports.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 54266c99b2)
This commit is contained in:
Rosen Penev 2019-12-01 20:49:23 -08:00
parent 6c5b9424e3
commit a677166dd9
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
3 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/zstd/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zstd PKG_NAME:=zstd
PKG_VERSION:=1.4.4 PKG_VERSION:=1.4.4
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/facebook/zstd/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/facebook/zstd/tar.gz/v$(PKG_VERSION)?

23
utils/zstd/patches/010-mtime.patch Normal file
View file

@ -0,0 +1,23 @@
From f62cf1fff5dabcfaaa8c85638723bc19842f52f4 Mon Sep 17 00:00:00 2001
From: Sergey Dryabzhinsky <sergey.dryabzhinsky+github@gmail.com>
Date: Tue, 19 Nov 2019 23:15:28 +0300
Subject: [PATCH] Fix typo in util.c
There must be mtim*e*
---
programs/util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/programs/util.c b/programs/util.c
index 5d15450d2..d3ffc1133 100644
--- a/programs/util.c
+++ b/programs/util.c
@@ -73,7 +73,7 @@ int UTIL_setFileStat(const char *filename, stat_t *statbuf)
{
/* (atime, mtime) */
struct timespec timebuf[2] = { {0, UTIME_NOW} };
- timebuf[1] = statbuf->st_mtim;
+ timebuf[1] = statbuf->st_mtime;
res += utimensat(AT_FDCWD, filename, timebuf, 0);
}
#endif

22
utils/zstd/patches/020-util.patch Normal file
View file

@ -0,0 +1,22 @@
From 612a06eb3ef7f42739ace99fbca6ad63b788d46c Mon Sep 17 00:00:00 2001
From: Sergey Dryabzhinsky <sergey.dryabzhinsky+github@gmail.com>
Date: Tue, 19 Nov 2019 23:24:00 +0300
Subject: [PATCH] Update util.c
---
programs/util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/programs/util.c b/programs/util.c
index d3ffc1133..aa75ca6d4 100644
--- a/programs/util.c
+++ b/programs/util.c
@@ -73,7 +73,7 @@ int UTIL_setFileStat(const char *filename, stat_t *statbuf)
{
/* (atime, mtime) */
struct timespec timebuf[2] = { {0, UTIME_NOW} };
- timebuf[1] = statbuf->st_mtime;
+ timebuf[1].tv_sec = statbuf->st_mtime;
res += utimensat(AT_FDCWD, filename, timebuf, 0);
}
#endif