alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

lz4: 131 -> v1.8.2 (#41293)

Browse source 
Upgrades lz4 from version 131 (released 2015-06-29) to v1.8.2 (released 2018-05-07)
This commit is contained in:
Benjamin Hipple 2018-06-03 08:17:32 -04:00 committed by Orivej Desh
parent 420827170c
commit 1baf5cfa7c
2 changed files with 4 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/compression/lz4/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "lz4-${version}";
version = "131";
version = "1.8.2";
src = fetchFromGitHub {
sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2";
rev = "r${version}";
sha256 = "0xbjbjrvgzypk8dnldakir06gb8m946d064lxx0qc4ky6m8n9hn2";
rev = "v${version}";
repo = "lz4";
owner = "Cyan4973";
owner = "lz4";
};
outputs = [ "out" "dev" ];
@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
doCheck = false; # tests take a very long time
checkTarget = "test";
patches = [ ./install-on-freebsd.patch ] ;
postInstall = "rm $out/lib/*.a";
meta = with stdenv.lib; {

54
pkgs/tools/compression/lz4/install-on-freebsd.patch
View file

@ -1,54 +0,0 @@
diff --git a/Makefile b/Makefile
index d1b0d0c..f8d6a2d 100644
--- a/Makefile
+++ b/Makefile
@@ -80,8 +80,6 @@ clean:
#------------------------------------------------------------------------
-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
install:
@cd $(LZ4DIR); $(MAKE) -e install
@@ -129,4 +127,3 @@ examples:
prg-travis:
@cd $(PRGDIR); $(MAKE) -e test-travis
-endif
diff --git a/lib/Makefile b/lib/Makefile
index 02ddd3b..26ed18f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -80,8 +80,6 @@ clean:
#------------------------------------------------------------------------
-#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
@echo creating pkgconfig
@@ -114,4 +112,3 @@ uninstall:
@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
@echo lz4 libraries successfully uninstalled
-endif
diff --git a/programs/Makefile b/programs/Makefile
index f422902..6943363 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -113,8 +113,6 @@ clean:
#------------------------------------------------------------------------
-#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
@@ -307,4 +305,3 @@ test-mem: lz4 datagen fuzzer frametest fullbench
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...
-endif