SF.net SVN: gar:[26719] csw/mgar/pkg/zstd/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Dec 18 21:24:30 CET 2020
Revision: 26719
http://sourceforge.net/p/gar/code/26719
Author: dmichelsen
Date: 2020-12-18 20:24:29 +0000 (Fri, 18 Dec 2020)
Log Message:
-----------
zstd/trunk: Update to 1.4.5
Modified Paths:
--------------
csw/mgar/pkg/zstd/trunk/Makefile
csw/mgar/pkg/zstd/trunk/checksums
csw/mgar/pkg/zstd/trunk/files/0001-Add-SunOS-as-supported-platform.patch
csw/mgar/pkg/zstd/trunk/files/0002-Use-bash-for-shellscripts.patch
Added Paths:
-----------
csw/mgar/pkg/zstd/trunk/files/0003-Link-to-librt-for-nanosleep.patch
Modified: csw/mgar/pkg/zstd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zstd/trunk/Makefile 2020-12-09 19:59:50 UTC (rev 26718)
+++ csw/mgar/pkg/zstd/trunk/Makefile 2020-12-18 20:24:29 UTC (rev 26719)
@@ -2,20 +2,24 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = zstd
-VERSION = 1.1.0
+VERSION = 1.4.5
GARTYPE = v2
DESCRIPTION = Fast real-time compression algorithm
-MASTER_SITES = https://github.com/facebook/zstd/releases/
+MASTER_SITES = https://github.com/facebook/zstd/releases/download/v$(VERSION)/
DISTFILES = $(DISTNAME).tar.gz
PATCHFILES += 0001-Add-SunOS-as-supported-platform.patch
PATCHFILES += 0002-Use-bash-for-shellscripts.patch
+PATCHFILES += 0003-Link-to-librt-for-nanosleep.patch
PACKAGES += CSWzstd
SPKG_DESC_CSWzstd = Fast real-time compression algorithm
# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWzstd += CSWliblzma5
+RUNTIME_DEP_PKGS_CSWzstd += CSWliblz4-1
+RUNTIME_DEP_PKGS_CSWzstd += CSWlibz1
PACKAGES += CSWlibzstd1
SPKG_DESC_CSWlibzstd1 = Fast real-time compression library, libzstd.so.1
@@ -35,7 +39,8 @@
# There is no configure
CONFIGURE_SCRIPTS =
-BUILD_ARGS += CC=gcc CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+# We need sed -E
+BUILD_ENV_PATH = /opt/csw/gnu:$(PATH)
TEST_TARGET = test
# We need md5sum
@@ -44,15 +49,12 @@
# We need GNU install as install
INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH)
-EXTRA_INSTALL_EXPORTS += PREFIX LIBDIR INCLUDEDIR MANDIR
+EXTRA_INSTALL_EXPORTS += PREFIX BINDIR LIBDIR INCLUDEDIR MANDIR
INSTALL_ENV_PREFIX = $(prefix)
+INSTALL_ENV_BINDIR = $(bindir)
INSTALL_ENV_LIBDIR = $(libdir)
INSTALL_ENV_INCLUDEDIR = $(includedir)
INSTALL_ENV_MANDIR = $(mandir)/man1
-# Until overriding BINDIR is possible use force here
-INSTALL_OVERRIDE_VARS += BINDIR
-INSTALL_OVERRIDE_VAR_BINDIR = $(bindir)
-
include gar/category.mk
Modified: csw/mgar/pkg/zstd/trunk/checksums
===================================================================
--- csw/mgar/pkg/zstd/trunk/checksums 2020-12-09 19:59:50 UTC (rev 26718)
+++ csw/mgar/pkg/zstd/trunk/checksums 2020-12-18 20:24:29 UTC (rev 26719)
@@ -1 +1 @@
-64fc5efcd1ca60a3cd74a3ccaf25006e zstd-1.1.0.tar.gz
+dd0b53631303b8f972dafa6fd34beb0c zstd-1.4.5.tar.gz
Modified: csw/mgar/pkg/zstd/trunk/files/0001-Add-SunOS-as-supported-platform.patch
===================================================================
--- csw/mgar/pkg/zstd/trunk/files/0001-Add-SunOS-as-supported-platform.patch 2020-12-09 19:59:50 UTC (rev 26718)
+++ csw/mgar/pkg/zstd/trunk/files/0001-Add-SunOS-as-supported-platform.patch 2020-12-18 20:24:29 UTC (rev 26719)
@@ -1,67 +1,53 @@
-From ff7c82ad4dff8147265978f25d9b0353a4bf6aa5 Mon Sep 17 00:00:00 2001
+From 00025600c45beebd8ee14127ab3a12d97da05dfa Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 4 Oct 2016 15:03:20 +0200
-Subject: [PATCH 1/2] Add SunOS as supported platform
+Date: Fri, 18 Dec 2020 15:25:22 +0100
+Subject: [PATCH] Add SunOS as supported platform
---
Makefile | 2 +-
lib/Makefile | 2 +-
programs/Makefile | 2 +-
- tests/Makefile | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
-index ac0c583..6816a41 100644
+index 2c1d346..8d662ee 100644
--- a/Makefile
+++ b/Makefile
-@@ -51,7 +51,7 @@ clean:
- #----------------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD, Hurd and some BSD targets
- #----------------------------------------------------------------------------------
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD))
-+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD SunOS))
+@@ -143,7 +143,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))
++ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT Haiku SunOS))
+
HOST_OS = POSIX
- install:
- $(MAKE) -C $(ZSTDDIR) $@
+ 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 -DCMAKE_BUILD_TYPE=Release
diff --git a/lib/Makefile b/lib/Makefile
-index 4fb8ed9..cb61fc4 100644
+index 7c6dff0..45ccf01 100644
--- a/lib/Makefile
+++ b/lib/Makefile
-@@ -78,7 +78,7 @@ clean:
+@@ -251,7 +251,7 @@ clean:
+ #-----------------------------------------------------------------------------
+ # make install is validated only for below listed environments
+ #-----------------------------------------------------------------------------
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku))
++ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku SunOS))
- #------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD, Hurd and some BSD targets
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD))
-+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD SunOS))
+ all: libzstd.pc
- libzstd.pc:
- libzstd.pc: libzstd.pc.in
diff --git a/programs/Makefile b/programs/Makefile
-index 6e78d0e..fbfbd60 100644
+index 418ad4e..f9e48ba 100644
--- a/programs/Makefile
+++ b/programs/Makefile
-@@ -134,7 +134,7 @@ clean:
- #----------------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD, Hurd and some BSD targets
- #----------------------------------------------------------------------------------
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD))
-+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD SunOS))
- install: zstd
- @echo Installing binaries
- @install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
-diff --git a/tests/Makefile b/tests/Makefile
-index 3ce9f31..cd8a481 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -151,7 +151,7 @@ clean:
- #----------------------------------------------------------------------------------
- #make valgrindTest is validated only for Linux, OSX, kFreeBSD, Hurd and some BSD targets
- #----------------------------------------------------------------------------------
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly))
-+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly SunOS))
- HOST_OS = POSIX
+@@ -312,7 +312,7 @@ preview-man: clean-man man
+ #-----------------------------------------------------------------------------
+ # make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets
+ #-----------------------------------------------------------------------------
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku))
++ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku SunOS))
- valgrindTest: VALGRIND = valgrind --leak-check=full --error-exitcode=1
+ HAVE_COLORNEVER = $(shell echo a | egrep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0)
+ EGREP_OPTIONS ?=
--
2.4.0
Modified: csw/mgar/pkg/zstd/trunk/files/0002-Use-bash-for-shellscripts.patch
===================================================================
--- csw/mgar/pkg/zstd/trunk/files/0002-Use-bash-for-shellscripts.patch 2020-12-09 19:59:50 UTC (rev 26718)
+++ csw/mgar/pkg/zstd/trunk/files/0002-Use-bash-for-shellscripts.patch 2020-12-18 20:24:29 UTC (rev 26719)
@@ -1,22 +1,42 @@
-From eea8981b22e1d1ddde6e0f49fb6cb0a37df15e88 Mon Sep 17 00:00:00 2001
+From d45f409c8d5e500e30466ea902161cb8aa5cae64 Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 4 Oct 2016 15:03:41 +0200
-Subject: [PATCH 2/2] Use bash for shellscripts
+Date: Thu, 17 Dec 2020 10:36:28 +0100
+Subject: [PATCH] Use bash for shellscripts
---
+ programs/zstdgrep | 4 ++--
tests/playTests.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+diff --git a/programs/zstdgrep b/programs/zstdgrep
+index 61efaa9..ce3fcf5 100755
+--- a/programs/zstdgrep
++++ b/programs/zstdgrep
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # Copyright (c) 2003 Thomas Klausner.
+ #
+@@ -22,7 +22,7 @@
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-grep=${GREP:-grep}
++grep=${GREP:-/opt/csw/bin/ggrep}
+ zcat=${ZCAT:-zstdcat}
+
+ endofopts=0
diff --git a/tests/playTests.sh b/tests/playTests.sh
-index d94d8fa..d343f10 100755
+index f353229..84c99d8 100755
--- a/tests/playTests.sh
+++ b/tests/playTests.sh
@@ -1,4 +1,4 @@
--#!/bin/sh -e
-+#!/opt/csw/bin/bash -e
+-#!/bin/sh
++#!/bin/bash
- die() {
- $ECHO "$@" 1>&2
+ set -e
+
--
2.4.0
Added: csw/mgar/pkg/zstd/trunk/files/0003-Link-to-librt-for-nanosleep.patch
===================================================================
--- csw/mgar/pkg/zstd/trunk/files/0003-Link-to-librt-for-nanosleep.patch (rev 0)
+++ csw/mgar/pkg/zstd/trunk/files/0003-Link-to-librt-for-nanosleep.patch 2020-12-18 20:24:29 UTC (rev 26719)
@@ -0,0 +1,25 @@
+From 6bfed857094bb8be45b207997a3654f1992f770f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 17 Dec 2020 18:34:26 +0100
+Subject: [PATCH] Link to librt for nanosleep()
+
+---
+ tests/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index d347a94..e9618a6 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -67,7 +67,7 @@ MULTITHREAD_LD =
+ else
+ EXT =
+ MULTITHREAD_CPP = -DZSTD_MULTITHREAD
+-MULTITHREAD_LD = -pthread
++MULTITHREAD_LD = -pthread -lrt
+ endif
+ MULTITHREAD = $(MULTITHREAD_CPP) $(MULTITHREAD_LD)
+
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list