forked from mirrors/nixpkgs
Revert "lz4: 131 -> 1.7.3"
This reverts commit 1f0a12ee8d
.
Systemd build was broken and such change should probably go through
staging anyway.
This commit is contained in:
parent
cdd8454510
commit
e68d8e05aa
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lz4-${version}";
|
||||
version = "1.7.3";
|
||||
version = "131";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "0b9yhgiqsdaqgq03vkgalrpbbw7p9a8n8j1nqipra5vw182jrvl0";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2";
|
||||
rev = "r${version}";
|
||||
repo = "lz4";
|
||||
owner = "Cyan4973";
|
||||
};
|
||||
|
@ -22,6 +22,8 @@ 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
Normal file
54
pkgs/tools/compression/lz4/install-on-freebsd.patch
Normal file
|
@ -0,0 +1,54 @@
|
|||
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
|
Loading…
Reference in a new issue