diff options
Diffstat (limited to 'packages/zstd')
-rw-r--r-- | packages/zstd/1.5.5/0000-Updated-Makefiles-for-full-MSYS2.patch | 68 | ||||
-rw-r--r-- | packages/zstd/1.5.6/0000-Fix-filter-and-Msys-Cygwin.patch | 197 | ||||
-rw-r--r-- | packages/zstd/1.5.6/chksum | 4 | ||||
-rw-r--r-- | packages/zstd/1.5.6/version.desc | 1 | ||||
-rw-r--r-- | packages/zstd/1.5.7/chksum | 4 | ||||
-rw-r--r-- | packages/zstd/1.5.7/version.desc | 1 | ||||
-rw-r--r-- | packages/zstd/package.desc | 2 |
7 files changed, 276 insertions, 1 deletions
diff --git a/packages/zstd/1.5.5/0000-Updated-Makefiles-for-full-MSYS2.patch b/packages/zstd/1.5.5/0000-Updated-Makefiles-for-full-MSYS2.patch new file mode 100644 index 00000000..de8f0de4 --- /dev/null +++ b/packages/zstd/1.5.5/0000-Updated-Makefiles-for-full-MSYS2.patch @@ -0,0 +1,68 @@ +From 78dbba76b81ea1d8713900b57bc5d5f5f43bf74b Mon Sep 17 00:00:00 2001 +From: Quentin Boswank <qubos@oulook.de> +Date: Sun, 13 Aug 2023 19:44:15 +0200 +Subject: [PATCH] Updated Makefiles for full MSYS2 and Cygwin installation and + testing support. + +They are Linux-like environments under Windows and have all the tools needed to support staged installation and testing. + +Beware: this only affects the make build system. +--- + Makefile | 2 +- + lib/Makefile | 2 +- + programs/Makefile | 2 +- + tests/Makefile | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 72a9480aab..fd95c38901 100644 +--- a/Makefile ++++ b/Makefile +@@ -151,7 +151,7 @@ clean: + #------------------------------------------------------------------------------ + # make install is validated only for Linux, macOS, Hurd and some BSD targets + #------------------------------------------------------------------------------ +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT Haiku AIX)) ++ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT CYGWIN_NT Haiku AIX)) + + HOST_OS = POSIX + +diff --git a/lib/Makefile b/lib/Makefile +index a4cf61ab10..6d349a3b48 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -249,7 +249,7 @@ clean: + #----------------------------------------------------------------------------- + # make install is validated only for below listed environments + #----------------------------------------------------------------------------- +-ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX)) ++ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX MSYS_NT CYGWIN_NT)) + + lib: libzstd.pc + +diff --git a/programs/Makefile b/programs/Makefile +index 8507abef3f..be83c24933 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -346,7 +346,7 @@ include $(wildcard $(DEPFILES)) + #----------------------------------------------------------------------------- + # make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets + #----------------------------------------------------------------------------- +-ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX)) ++ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX MSYS_NT CYGWIN_NT)) + + HAVE_COLORNEVER = $(shell echo a | egrep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0) + EGREP_OPTIONS ?= +diff --git a/tests/Makefile b/tests/Makefile +index 778c7d6759..c31e750055 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -263,7 +263,7 @@ clean: + # valgrind tests validated only for some posix platforms + #---------------------------------------------------------------------------------- + UNAME := $(shell uname) +-ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS AIX)) ++ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS AIX CYGWIN_NT)) + HOST_OS = POSIX + + .PHONY: test-valgrind diff --git a/packages/zstd/1.5.6/0000-Fix-filter-and-Msys-Cygwin.patch b/packages/zstd/1.5.6/0000-Fix-filter-and-Msys-Cygwin.patch new file mode 100644 index 00000000..181e3b15 --- /dev/null +++ b/packages/zstd/1.5.6/0000-Fix-filter-and-Msys-Cygwin.patch @@ -0,0 +1,197 @@ +From 192474ab593fe550feab093ae9ade47b575778f6 Mon Sep 17 00:00:00 2001 +From: Quentin Boswank <qubos@outlook.de> +Date: Wed, 5 Jun 2024 18:21:34 +0200 +Subject: [PATCH] Fix $filter and Msys/Cygwin + +- switched the patter and input of $filter into the right places +- added pattern wildcard to MSYS_NT & CYGWIN_NT as they change with windows versions +- correctly identify MSYS2, even in an env like MINGW64 +--- + Makefile | 8 ++++---- + doc/educational_decoder/Makefile | 2 +- + lib/Makefile | 6 +++--- + lib/libzstd.mk | 2 +- + programs/Makefile | 6 +++--- + tests/Makefile | 8 ++++---- + tests/fuzz/Makefile | 2 +- + tests/gzip/Makefile | 2 +- + 8 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/Makefile b/Makefile +index 11eca19c..42c8f646 100644 +--- a/Makefile ++++ b/Makefile +@@ -151,7 +151,7 @@ clean: + #------------------------------------------------------------------------------ + # make install is validated only for Linux, macOS, Hurd and some BSD targets + #------------------------------------------------------------------------------ +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT CYGWIN_NT Haiku AIX)) ++ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT% CYGWIN_NT% Haiku AIX,$(shell sh -c 'MSYSTEM="MSYS" uname') )) + + HOST_OS = POSIX + +@@ -390,19 +390,19 @@ lz4install: + endif + + +-ifneq (,$(filter MSYS%,$(shell uname))) ++ifneq (,$(filter MSYS%,$(shell sh -c 'MSYSTEM="MSYS" uname') )) + HOST_OS = MSYS + endif + + #------------------------------------------------------------------------ + # target specific tests + #------------------------------------------------------------------------ +-ifneq (,$(filter $(HOST_OS),MSYS POSIX)) ++ifneq (,$(filter MSYS POSIX,$(HOST_OS))) + + CMAKE ?= cmake + CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON + +-ifneq (,$(filter MSYS%,$(shell uname))) ++ifneq (,$(filter MSYS%,$(shell sh -c 'MSYSTEM="MSYS" uname'))) + CMAKE_PARAMS = -G"MSYS Makefiles" -DZSTD_MULTITHREAD_SUPPORT:BOOL=OFF -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON + endif + +diff --git a/doc/educational_decoder/Makefile b/doc/educational_decoder/Makefile +index f6deeb13..faf757f0 100644 +--- a/doc/educational_decoder/Makefile ++++ b/doc/educational_decoder/Makefile +@@ -10,7 +10,7 @@ + + ZSTD ?= zstd # note: requires zstd installation on local system + +-UNAME?= $(shell uname) ++UNAME?= $(shell sh -c 'MSYSTEM="MSYS" uname') + ifeq ($(UNAME), SunOS) + DIFF ?= gdiff + else +diff --git a/lib/Makefile b/lib/Makefile +index 8bfdade9..f61a233a 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -261,7 +261,7 @@ clean: + #----------------------------------------------------------------------------- + # make install is validated only for below listed environments + #----------------------------------------------------------------------------- +-ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX MSYS_NT CYGWIN_NT)) ++ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX MSYS_NT% CYGWIN_NT%,$(UNAME))) + + lib: libzstd.pc + +@@ -292,13 +292,13 @@ PCLIBPREFIX := $(if $(findstring $(LIBDIR),$(PCLIBDIR)),,$${exec_prefix}) + # to PREFIX, rather than as a resolved value. + PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix}) + +-ifneq (,$(filter $(UNAME),FreeBSD NetBSD DragonFly)) ++ifneq (,$(filter FreeBSD NetBSD DragonFly,$(UNAME))) + PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig + else + PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig + endif + +-ifneq (,$(filter $(UNAME),SunOS)) ++ifneq (,$(filter SunOS,$(UNAME))) + INSTALL ?= ginstall + else + INSTALL ?= install +diff --git a/lib/libzstd.mk b/lib/libzstd.mk +index a308a6ef..199fa43c 100644 +--- a/lib/libzstd.mk ++++ b/lib/libzstd.mk +@@ -206,7 +206,7 @@ endif + endif + CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) + +-UNAME := $(shell uname) ++UNAME := $(shell sh -c 'MSYSTEM="MSYS" uname') + + ifndef BUILD_DIR + ifeq ($(UNAME), Darwin) +diff --git a/programs/Makefile b/programs/Makefile +index 4dcd8410..e1a30fc2 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -345,7 +345,7 @@ include $(wildcard $(DEPFILES)) + #----------------------------------------------------------------------------- + # make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets + #----------------------------------------------------------------------------- +-ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX MSYS_NT CYGWIN_NT)) ++ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX MSYS_NT% CYGWIN_NT%,$(UNAME))) + + HAVE_COLORNEVER = $(shell echo a | egrep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0) + EGREP_OPTIONS ?= +@@ -388,14 +388,14 @@ datarootdir ?= $(PREFIX)/share + mandir ?= $(datarootdir)/man + man1dir ?= $(mandir)/man1 + +-ifneq (,$(filter $(UNAME),OpenBSD FreeBSD NetBSD DragonFly SunOS)) ++ifneq (,$(filter OpenBSD FreeBSD NetBSD DragonFly SunOS,$(UNAME))) + MANDIR ?= $(PREFIX)/man + MAN1DIR ?= $(MANDIR)/man1 + else + MAN1DIR ?= $(man1dir) + endif + +-ifneq (,$(filter $(UNAME),SunOS)) ++ifneq (,$(filter SunOS,$(UNAME))) + INSTALL ?= ginstall + else + INSTALL ?= install +diff --git a/tests/Makefile b/tests/Makefile +index ed3692a2..6f46bead 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -271,8 +271,8 @@ clean: + #---------------------------------------------------------------------------------- + # valgrind tests validated only for some posix platforms + #---------------------------------------------------------------------------------- +-UNAME := $(shell uname) +-ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS AIX CYGWIN_NT)) ++UNAME := $(shell sh -c 'MSYSTEM="MSYS" uname') ++ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS AIX CYGWIN_NT%,$(UNAME))) + HOST_OS = POSIX + + .PHONY: test-valgrind +@@ -300,10 +300,10 @@ endif + #----------------------------------------------------------------------------- + # make tests validated only for below targets + #----------------------------------------------------------------------------- +-ifneq (,$(filter $(HOST_OS),MSYS POSIX)) ++ifneq (,$(filter MSYS POSIX,$(HOST_OS))) + + DIFF:=diff +-ifneq (,$(filter $(UNAME),SunOS)) ++ifneq (,$(filter SunOS,$(UNAME))) + DIFF:=gdiff + endif + +diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile +index 430f6df1..06b8aa4c 100644 +--- a/tests/fuzz/Makefile ++++ b/tests/fuzz/Makefile +@@ -17,7 +17,7 @@ LDFLAGS ?= + ARFLAGS ?= + LIB_FUZZING_ENGINE ?= libregression.a + PYTHON ?= python +-ifeq ($(shell uname), Darwin) ++ifeq ($(shell sh -c 'MSYSTEM="MSYS" uname'), Darwin) + DOWNLOAD?=curl -L -o + else + DOWNLOAD?=wget -O +diff --git a/tests/gzip/Makefile b/tests/gzip/Makefile +index cca31096..837ba435 100644 +--- a/tests/gzip/Makefile ++++ b/tests/gzip/Makefile +@@ -36,7 +36,7 @@ clean: + #------------------------------------------------------------------------------ + # validated only for Linux, macOS, Hurd and some BSD targets + #------------------------------------------------------------------------------ +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD)) ++ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD,$(shell sh -c 'MSYSTEM="MSYS" uname'))) + + test-%: zstd + @./test-driver.sh --test-name $* --log-file $*.log --trs-file $*.trs --expect-failure "no" --color-tests "yes" --enable-hard-errors "yes" ./$*.sh +-- +2.47.1 + diff --git a/packages/zstd/1.5.6/chksum b/packages/zstd/1.5.6/chksum new file mode 100644 index 00000000..524ca74f --- /dev/null +++ b/packages/zstd/1.5.6/chksum @@ -0,0 +1,4 @@ +md5 zstd-1.5.6.tar.gz 5a473726b3445d0e5d6296afd1ab6854 +sha1 zstd-1.5.6.tar.gz 459ab8de8c24fc3ce648a35a07b31fcd6616ade2 +sha256 zstd-1.5.6.tar.gz 8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1 +sha512 zstd-1.5.6.tar.gz 54a578f2484da0520a6e9a24f501b9540a3fe3806785d6bc9db79fc095b7c142a7c121387c7eecd460ca71446603584ef1ba4d29a33ca90873338c9ffbd04f14 diff --git a/packages/zstd/1.5.6/version.desc b/packages/zstd/1.5.6/version.desc new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/packages/zstd/1.5.6/version.desc @@ -0,0 +1 @@ + diff --git a/packages/zstd/1.5.7/chksum b/packages/zstd/1.5.7/chksum new file mode 100644 index 00000000..ee986ab9 --- /dev/null +++ b/packages/zstd/1.5.7/chksum @@ -0,0 +1,4 @@ +md5 zstd-1.5.7.tar.gz 780fc1896922b1bc52a4e90980cdda48 +sha1 zstd-1.5.7.tar.gz 6c7dd9c829561ac5475b72592a079a01ab7f3eab +sha256 zstd-1.5.7.tar.gz eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 +sha512 zstd-1.5.7.tar.gz b4de208f179b68d4c6454139ca60d66ed3ef3893a560d6159a056640f83d3ee67cdf6ffb88971cdba35449dba4b597eaa8b4ae908127ef7fd58c89f40bf9a705 diff --git a/packages/zstd/1.5.7/version.desc b/packages/zstd/1.5.7/version.desc new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/packages/zstd/1.5.7/version.desc @@ -0,0 +1 @@ + diff --git a/packages/zstd/package.desc b/packages/zstd/package.desc index 2b9cdcd9..51366014 100644 --- a/packages/zstd/package.desc +++ b/packages/zstd/package.desc @@ -1,4 +1,4 @@ repository='git https://github.com/facebook/zstd.git' -mirrors='https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/' +mirrors='https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://downloads.sourceforge.net/project/zstandard.mirror/v${CT_ZSTD_VERSION}' archive_formats='.tar.gz' signature_format='packed/.sig' |