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
cvs diff -r1.37 -r1.38 pkgsrc/archivers/zstd/Makefile (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.37 2021/02/11 10:36:22 nia Exp $ 1# $NetBSD: Makefile,v 1.38 2021/02/27 16:40:59 wiz Exp $
2 2
3DISTNAME= zstd-1.4.8 3DISTNAME= zstd-1.4.8
4CATEGORIES= archivers 4CATEGORIES= archivers
5MASTER_SITES= ${MASTER_SITE_GITHUB:=facebook/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=facebook/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://facebook.github.io/zstd/ 9HOMEPAGE= https://facebook.github.io/zstd/
10COMMENT= Fast real-time compression algorithm 10COMMENT= Fast real-time compression algorithm
11LICENSE= modified-bsd OR gnu-gpl-v2 11LICENSE= modified-bsd OR gnu-gpl-v2
12 12
13CHECK_PORTABILITY_SKIP+= tests/playTests.sh 13CHECK_PORTABILITY_SKIP+= tests/playTests.sh
14 14
@@ -33,21 +33,19 @@ MAKE_ENV+= HASH="md5 -n" @@ -33,21 +33,19 @@ MAKE_ENV+= HASH="md5 -n"
33 ${OPSYS} != "OpenBSD" 33 ${OPSYS} != "OpenBSD"
34TOOL_DEPENDS+= coreutils>=0:../../sysutils/coreutils 34TOOL_DEPENDS+= coreutils>=0:../../sysutils/coreutils
35MAKE_ENV+= HASH=gmd5sum 35MAKE_ENV+= HASH=gmd5sum
36.endif 36.endif
37 37
38USE_LANGUAGES= c c++ 38USE_LANGUAGES= c c++
39USE_TOOLS+= ggrep gmake pkg-config 39USE_TOOLS+= ggrep gmake pkg-config
40PKGCONFIG_OVERRIDE+= lib/libzstd.pc.in 40PKGCONFIG_OVERRIDE+= lib/libzstd.pc.in
41MAKE_FLAGS= MANDIR=${PREFIX}/${PKGMANDIR} 41MAKE_FLAGS= MANDIR=${PREFIX}/${PKGMANDIR}
42MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} 42MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
43MAKE_FLAGS+= INSTALL=${INSTALL:Q} 43MAKE_FLAGS+= INSTALL=${INSTALL:Q}
44 44
45BUILD_TARGET= allmost 45BUILD_TARGET= allmost
46# stat -c error 
47# https://github.com/facebook/zstd/issues/2493 
48TEST_TARGET= test 46TEST_TARGET= test
49 47
50.include "../../archivers/lz4/buildlink3.mk" 48.include "../../archivers/lz4/buildlink3.mk"
51.include "../../archivers/xz/buildlink3.mk" 49.include "../../archivers/xz/buildlink3.mk"
52.include "../../devel/zlib/buildlink3.mk" 50.include "../../devel/zlib/buildlink3.mk"
53.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"
cvs diff -r1.26 -r1.27 pkgsrc/archivers/zstd/distinfo (expand / switch to unified diff)

--- 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,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: distinfo,v 1.26 2021/01/03 14:55:50 adam Exp $ 1$NetBSD: distinfo,v 1.27 2021/02/27 16:40:59 wiz Exp $
2 2
3SHA1 (zstd-1.4.8.tar.gz) = e3027d788b964429c773fab05e000061dc6eb3f6 3SHA1 (zstd-1.4.8.tar.gz) = e3027d788b964429c773fab05e000061dc6eb3f6
4RMD160 (zstd-1.4.8.tar.gz) = 94aa90fff2a52a5c0314a19d2a59903ac760eada 4RMD160 (zstd-1.4.8.tar.gz) = 94aa90fff2a52a5c0314a19d2a59903ac760eada
5SHA512 (zstd-1.4.8.tar.gz) = 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a 5SHA512 (zstd-1.4.8.tar.gz) = 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a
6Size (zstd-1.4.8.tar.gz) = 1816546 bytes 6Size (zstd-1.4.8.tar.gz) = 1816546 bytes
7SHA1 (patch-Makefile) = e1e702cd3b461d432e25909fdcf01cc51c769a8a 7SHA1 (patch-Makefile) = e1e702cd3b461d432e25909fdcf01cc51c769a8a
8SHA1 (patch-lib_Makefile) = 8d31689c4bf9dd97b82f01396ef6b58cb29fd80e 8SHA1 (patch-lib_Makefile) = 8d31689c4bf9dd97b82f01396ef6b58cb29fd80e
9SHA1 (patch-programs_Makefile) = 9d57ba124fc2b243d6fcb8bfb744c2d39ac89e0e 9SHA1 (patch-programs_Makefile) = 9d57ba124fc2b243d6fcb8bfb744c2d39ac89e0e
 10SHA1 (patch-tests_Makefile) = b83de10222859d656468463071dbce70adcc22b1
 11SHA1 (patch-tests_playTests.sh) = 0441092d88e650bce21f5728a9984da71bdbf5d9
10SHA1 (patch-zlibWrapper_examples_minigzip.c) = 4ed0cb648bdd6efa61b3f66ba6eb1ea74b7767ec 12SHA1 (patch-zlibWrapper_examples_minigzip.c) = 4ed0cb648bdd6efa61b3f66ba6eb1ea74b7767ec
File Added: pkgsrc/archivers/zstd/patches/patch-tests_Makefile
$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
File Added: pkgsrc/archivers/zstd/patches/patch-tests_playTests.sh
$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"