diff options
author | fhajny <fhajny@pkgsrc.org> | 2014-10-02 08:52:41 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2014-10-02 08:52:41 +0000 |
commit | e244026bd45a02e3013fb3345ab101a8429efa60 (patch) | |
tree | 0bb156e81f9af51fa2af97a24bd93f6d477c3968 /archivers/lz4 | |
parent | ff796887954c97475a83a7d28fb41bcf7e926252 (diff) | |
download | pkgsrc-e244026bd45a02e3013fb3345ab101a8429efa60.tar.gz |
Update lz4 to r123.
r123:
Added : experimental lz4frame API, thanks to Takayuki Matsuoka and
Christopher Jackson for testings
Fix : s390x support, thanks to Nobuhiro Iwamatsu
Fix : test mode (-t) no longer requires confirmation, thanks to Thary Nguyen
r122:
Fix : AIX & AIX64 support (SamG)
Fix : mips 64-bits support (lew van)
Added : Examples directory, using code examples from Takayuki Matsuoka
Updated : Framing specification, to v1.4.1
Updated : xxHash, to r36
r121:
Added : Makefile : install for kFreeBSD and Hurd (Nobuhiro Iwamatsu)
Fix : Makefile : install for OS-X and BSD, thanks to Takayuki Matsuoka
Diffstat (limited to 'archivers/lz4')
-rw-r--r-- | archivers/lz4/Makefile | 4 | ||||
-rw-r--r-- | archivers/lz4/PLIST | 4 | ||||
-rw-r--r-- | archivers/lz4/distinfo | 14 | ||||
-rw-r--r-- | archivers/lz4/patches/patch-Makefile | 40 | ||||
-rw-r--r-- | archivers/lz4/patches/patch-programs_Makefile | 24 | ||||
-rw-r--r-- | archivers/lz4/patches/patch-programs_fuzzer.c | 14 |
6 files changed, 46 insertions, 54 deletions
diff --git a/archivers/lz4/Makefile b/archivers/lz4/Makefile index 88266045af7..ce332f6843e 100644 --- a/archivers/lz4/Makefile +++ b/archivers/lz4/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2014/08/06 10:41:33 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2014/10/02 08:52:41 fhajny Exp $ -DISTNAME= lz4-r120 +DISTNAME= lz4-r123 PKGNAME= ${DISTNAME:S/-r/-/} CATEGORIES= archivers MASTER_SITES= -https://github.com/Cyan4973/lz4/archive/${DISTNAME:S/lz4-//}${EXTRACT_SUFX} diff --git a/archivers/lz4/PLIST b/archivers/lz4/PLIST index e07d7ed7ddf..53d0c3ffbf2 100644 --- a/archivers/lz4/PLIST +++ b/archivers/lz4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2014/08/06 10:41:33 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/10/02 08:52:41 fhajny Exp $ bin/lz4 bin/lz4c bin/lz4cat @@ -7,7 +7,7 @@ include/lz4hc.h lib/liblz4.a lib/liblz4.so lib/liblz4.so.1 -lib/liblz4.so.1.3.0 +lib/liblz4.so.1.3.1 lib/pkgconfig/liblz4.pc man/man1/lz4.1 man/man1/lz4c.1 diff --git a/archivers/lz4/distinfo b/archivers/lz4/distinfo index 9bb869d6607..90b7376b3e4 100644 --- a/archivers/lz4/distinfo +++ b/archivers/lz4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1 2014/08/06 10:41:33 fhajny Exp $ +$NetBSD: distinfo,v 1.2 2014/10/02 08:52:41 fhajny Exp $ -SHA1 (lz4-r120.tar.gz) = 6c657297eb9bd47f2f4de76fbc89204b652377c9 -RMD160 (lz4-r120.tar.gz) = fa76b7dff8a5bda1de370a28ca7d7719031ef7a6 -Size (lz4-r120.tar.gz) = 161950 bytes -SHA1 (patch-Makefile) = 30b138d69267c9d3b110165e2b709e8e1b01f552 -SHA1 (patch-programs_Makefile) = 8d633547c1bac2710d49c859be41463a32693408 -SHA1 (patch-programs_fuzzer.c) = fc7560d0257e8e90bcccf7ae8082061ff0d9ebf4 +SHA1 (lz4-r123.tar.gz) = 588d51ea02a0bc325229601412b1e829a4806413 +RMD160 (lz4-r123.tar.gz) = 2a6c899dee8f84b619f7cdb8ec0cea3ebb273910 +Size (lz4-r123.tar.gz) = 137315 bytes +SHA1 (patch-Makefile) = 223bf2c60dfd050ef4eb2e03feda988011686cdb +SHA1 (patch-programs_Makefile) = b248d8967966c482f9d2ee6d51faf245aca3aab1 +SHA1 (patch-programs_fuzzer.c) = 711c0e37128d983000bde1b42afec6f9ee9f0e85 diff --git a/archivers/lz4/patches/patch-Makefile b/archivers/lz4/patches/patch-Makefile index cc3b2b71e94..60a669f41b3 100644 --- a/archivers/lz4/patches/patch-Makefile +++ b/archivers/lz4/patches/patch-Makefile @@ -1,38 +1,36 @@ -$NetBSD: patch-Makefile,v 1.1 2014/08/06 10:41:34 fhajny Exp $ +$NetBSD: patch-Makefile,v 1.2 2014/10/02 08:52:41 fhajny Exp $ Make portable, use pkgsrc install scripts. ---- Makefile.orig 2014-07-24 11:54:05.000000000 +0000 +--- Makefile.orig 2014-09-25 12:03:36.000000000 +0000 +++ Makefile -@@ -33,13 +33,13 @@ +@@ -33,9 +33,9 @@ # Version numbers - VERSION=120 + VERSION=123 export RELEASE=r$(VERSION) --LIBVER_MAJOR=`sed -n '/LZ4_VERSION_MAJOR/s/.*\s\+\([0-9]\+\).*/\1/p' < lz4.h` --LIBVER_MINOR=`sed -n '/LZ4_VERSION_MINOR/s/.*\s\+\([0-9]\+\).*/\1/p' < lz4.h` --LIBVER_PATCH=`sed -n '/LZ4_VERSION_RELEASE/s/.*\s\+\([0-9]\+\).*/\1/p' < lz4.h` +-LIBVER_MAJOR=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` +-LIBVER_MINOR=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` +-LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` +LIBVER_MAJOR=`awk '$$2=="LZ4_VERSION_MAJOR" {print $$3}' < lz4.h` +LIBVER_MINOR=`awk '$$2=="LZ4_VERSION_MINOR" {print $$3}' < lz4.h` +LIBVER_PATCH=`awk '$$2=="LZ4_VERSION_RELEASE" {print $$3}' < lz4.h` LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH) - DESTDIR= --PREFIX = /usr -+PREFIX?= /usr - CC := $(CC) - CFLAGS?= -O3 - CFLAGS+= -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wstrict-prototypes -DLZ4_VERSION=\"$(RELEASE)\" -@@ -111,24 +111,22 @@ clean: - #------------------------------------------------------------------------ - #make install option is designed for Linux & OSX targets only + DESTDIR?= +@@ -111,27 +111,23 @@ clean: + @echo Cleaning completed --ifneq (,$(filter $(shell uname),Linux Darwin)) + +-#------------------------------------------------------------------------ +-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - liblz4.pc: liblz4.pc.in Makefile -- sed -e 's|@PREFIX@|$(PREFIX)|' \ + @echo creating pkgconfig +- @sed -e 's|@PREFIX@|$(PREFIX)|' \ - -e 's|@LIBDIR@|$(LIBDIR)|' \ - -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \ - -e 's|@VERSION@|$(VERSION)|' \ -+ sed -e 's|@PREFIX@|$(PREFIX)|g' \ ++ @sed -e 's|@PREFIX@|$(PREFIX)|g' \ + -e 's|@LIBDIR@|$(LIBDIR)|g' \ + -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|g' \ + -e 's|@VERSION@|$(VERSION)|g' \ @@ -58,8 +56,8 @@ Make portable, use pkgsrc install scripts. @echo lz4 static and shared library installed @cd $(PRGDIR); $(MAKE) -e install -@@ -165,4 +163,3 @@ test: - test-travis: lz4programs +@@ -166,4 +162,3 @@ test: + @cd examples; $(MAKE) -e $@ @cd $(PRGDIR); $(MAKE) -e $@ -endif diff --git a/archivers/lz4/patches/patch-programs_Makefile b/archivers/lz4/patches/patch-programs_Makefile index 86d3dede5d7..eb3badd3074 100644 --- a/archivers/lz4/patches/patch-programs_Makefile +++ b/archivers/lz4/patches/patch-programs_Makefile @@ -1,18 +1,10 @@ -$NetBSD: patch-programs_Makefile,v 1.1 2014/08/06 10:41:34 fhajny Exp $ +$NetBSD: patch-programs_Makefile,v 1.2 2014/10/02 08:52:41 fhajny Exp $ Make portable, use pkgsrc install scripts. ---- programs/Makefile.orig 2014-07-24 11:54:05.000000000 +0000 +--- programs/Makefile.orig 2014-09-25 12:03:36.000000000 +0000 +++ programs/Makefile -@@ -32,14 +32,14 @@ - - RELEASE=r120 - DESTDIR= --PREFIX=/usr -+PREFIX?=/usr - CC:=$(CC) - CFLAGS?= -O3 - CFLAGS+= -std=c99 -Wall -Wextra -Wundef -Wshadow -Wstrict-prototypes -DLZ4_VERSION=\"$(RELEASE)\" - FLAGS= -I.. $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) +@@ -40,7 +40,7 @@ CFLAGS += -std=c99 -Wall -Wextra -Wundef + FLAGS = -I.. $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) BINDIR=$(PREFIX)/bin -MANDIR=$(PREFIX)/share/man/man1 @@ -20,11 +12,13 @@ Make portable, use pkgsrc install scripts. LZ4DIR=.. TEST_FILES = COPYING -@@ -103,18 +103,16 @@ clean: +@@ -107,20 +107,16 @@ clean: @echo Cleaning completed --ifneq (,$(filter $(shell uname),Linux Darwin)) +-#------------------------------------------------------------------------ +-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - install: lz4 lz4c @echo Installing binaries @@ -45,7 +39,7 @@ Make portable, use pkgsrc install scripts. @echo lz4 installation completed uninstall: -@@ -170,4 +168,3 @@ test-mem: lz4 datagen +@@ -185,4 +181,3 @@ test-mem: lz4 datagen frametest test-mem32: lz4c32 datagen # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system... diff --git a/archivers/lz4/patches/patch-programs_fuzzer.c b/archivers/lz4/patches/patch-programs_fuzzer.c index 91a7bb4e2c1..da73d9ac3fe 100644 --- a/archivers/lz4/patches/patch-programs_fuzzer.c +++ b/archivers/lz4/patches/patch-programs_fuzzer.c @@ -1,19 +1,19 @@ -$NetBSD: patch-programs_fuzzer.c,v 1.1 2014/08/06 10:41:34 fhajny Exp $ +$NetBSD: patch-programs_fuzzer.c,v 1.2 2014/10/02 08:52:41 fhajny Exp $ Add portable code for ftime for NetBSD. Based on https://code.google.com/p/lz4/source/detail?r=81. ---- programs/fuzzer.c.orig 2014-07-24 11:54:05.000000000 +0000 +--- programs/fuzzer.c.orig 2014-09-25 12:03:36.000000000 +0000 +++ programs/fuzzer.c -@@ -29,6 +29,7 @@ - #ifdef _MSC_VER /* Visual Studio */ +@@ -30,6 +30,7 @@ # pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ # pragma warning(disable : 4146) /* disable: C4146: minus unsigned expression */ + # pragma warning(disable : 4310) /* disable: C4310: constant char value > 127 */ +# define BMK_LEGACY_TIMER 1 #endif -@@ -37,12 +38,17 @@ +@@ -38,12 +39,17 @@ **************************************/ #include <stdlib.h> #include <stdio.h> // fgets, sscanf @@ -32,7 +32,7 @@ Based on https://code.google.com/p/lz4/source/detail?r=81. /************************************** Basic Types -@@ -103,8 +109,11 @@ static int displayLevel = 2; +@@ -104,8 +110,11 @@ static int displayLevel = 2; /********************************************************* Fuzzer functions *********************************************************/ @@ -44,7 +44,7 @@ Based on https://code.google.com/p/lz4/source/detail?r=81. struct timeb tb; int nCount; ftime( &tb ); -@@ -112,6 +121,20 @@ static int FUZ_GetMilliStart(void) +@@ -113,6 +122,20 @@ static int FUZ_GetMilliStart(void) return nCount; } |