Sat Feb 27 16:40:59 2021 UTC ()
zstd: add more patches to let test runs progress further.
(wiz)
diff -r1.37 -r1.38 pkgsrc/archivers/zstd/Makefile
diff -r1.26 -r1.27 pkgsrc/archivers/zstd/distinfo
diff -r0 -r1.1 pkgsrc/archivers/zstd/patches/patch-tests_Makefile
diff -r0 -r1.1 pkgsrc/archivers/zstd/patches/patch-tests_playTests.sh
--- pkgsrc/archivers/zstd/Makefile 2021/02/11 10:36:22 1.37
+++ pkgsrc/archivers/zstd/Makefile 2021/02/27 16:40:59 1.38
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2021/02/11 10:36:22 nia Exp $
+# $NetBSD: Makefile,v 1.38 2021/02/27 16:40:59 wiz Exp $
DISTNAME= zstd-1.4.8
CATEGORIES= archivers
@@ -43,8 +43,6 @@
MAKE_FLAGS+= INSTALL=${INSTALL:Q}
BUILD_TARGET= allmost
-# stat -c error
-# https://github.com/facebook/zstd/issues/2493
TEST_TARGET= test
.include "../../archivers/lz4/buildlink3.mk"
--- pkgsrc/archivers/zstd/distinfo 2021/01/03 14:55:50 1.26
+++ pkgsrc/archivers/zstd/distinfo 2021/02/27 16:40:59 1.27
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2021/01/03 14:55:50 adam Exp $
+$NetBSD: distinfo,v 1.27 2021/02/27 16:40:59 wiz Exp $
SHA1 (zstd-1.4.8.tar.gz) = e3027d788b964429c773fab05e000061dc6eb3f6
RMD160 (zstd-1.4.8.tar.gz) = 94aa90fff2a52a5c0314a19d2a59903ac760eada
@@ -7,4 +7,6 @@
SHA1 (patch-Makefile) = e1e702cd3b461d432e25909fdcf01cc51c769a8a
SHA1 (patch-lib_Makefile) = 8d31689c4bf9dd97b82f01396ef6b58cb29fd80e
SHA1 (patch-programs_Makefile) = 9d57ba124fc2b243d6fcb8bfb744c2d39ac89e0e
+SHA1 (patch-tests_Makefile) = b83de10222859d656468463071dbce70adcc22b1
+SHA1 (patch-tests_playTests.sh) = 0441092d88e650bce21f5728a9984da71bdbf5d9
SHA1 (patch-zlibWrapper_examples_minigzip.c) = 4ed0cb648bdd6efa61b3f66ba6eb1ea74b7767ec
$NetBSD: patch-tests_Makefile,v 1.1 2021/02/27 16:40:59 wiz Exp $
Fix running tests with shared zstd library.
--- tests/Makefile.orig 2020-12-19 00:39:42.000000000 +0000
+++ tests/Makefile
@@ -327,7 +327,7 @@ test-zstd-nolegacy: zstd-nolegacy
test-zstd test-zstd32 test-zstd-nolegacy: datagen
file $(ZSTD)
- EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST)
+ LD_LIBRARY_PATH=../lib EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST)
test-fullbench: fullbench datagen
$(QEMU_SYS) ./fullbench -i1
$NetBSD: patch-tests_playTests.sh,v 1.1 2021/02/27 16:40:59 wiz Exp $
Fix md5 call on NetBSD.
Fix stat arguments on NetBSD.
https://github.com/facebook/zstd/issues/2493
--- tests/playTests.sh.orig 2020-12-19 00:39:42.000000000 +0000
+++ tests/playTests.sh
@@ -113,6 +113,7 @@ esac
case "$UNAME" in
Darwin) MD5SUM="md5 -r" ;;
+ NetBSD) MD5SUM="md5 -n" ;;
FreeBSD) MD5SUM="gmd5sum" ;;
OpenBSD) MD5SUM="md5" ;;
*) MD5SUM="md5sum" ;;
@@ -120,7 +121,7 @@ esac
MTIME="stat -c %Y"
case "$UNAME" in
- Darwin | FreeBSD | OpenBSD) MTIME="stat -f %m" ;;
+ Darwin | FreeBSD | OpenBSD | NetBSD) MTIME="stat -f %m" ;;
esac
DIFF="diff"