From 2675561120a45ceceef9f2de398bb9d392117f4c Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 16 Sep 2018 17:24:52 +0000 Subject: [PATCH] lz4: bump to 1.8.3. --- .../{lz4-1.8.2.recipe => lz4-1.8.3.recipe} | 24 +++----- app-arch/lz4/patches/lz4-1.8.2.patchset | 61 ------------------- 2 files changed, 8 insertions(+), 77 deletions(-) rename app-arch/lz4/{lz4-1.8.2.recipe => lz4-1.8.3.recipe} (83%) delete mode 100644 app-arch/lz4/patches/lz4-1.8.2.patchset diff --git a/app-arch/lz4/lz4-1.8.2.recipe b/app-arch/lz4/lz4-1.8.3.recipe similarity index 83% rename from app-arch/lz4/lz4-1.8.2.recipe rename to app-arch/lz4/lz4-1.8.3.recipe index 59aac752a..83d74f58d 100644 --- a/app-arch/lz4/lz4-1.8.2.recipe +++ b/app-arch/lz4/lz4-1.8.3.recipe @@ -6,14 +6,13 @@ core, typically reaching RAM speed limits on multi-core systems." HOMEPAGE="https://lz4.github.io/lz4/" COPYRIGHT="2011-2018 Yann Collet" LICENSE="BSD (2-clause)" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/lz4/lz4/archive/v$portVersion.tar.gz" SOURCE_FILENAME="lz4-$portVersion.tar.gz" -CHECKSUM_SHA256="0963fbe9ee90acd1d15e9f09e826eaaf8ea0312e854803caf2db0a6dd40f4464" -PATCHES="lz4-$portVersion.patchset" +CHECKSUM_SHA256="33af5936ac06536805f9745e0b6d61da606a1f8b4cc5c04dd3cbaca3b9b4fc43" ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" @@ -87,10 +86,10 @@ INSTALL() make install LIBDIR="$libDir" INCLUDEDIR="$includeDir" BINDIR="$binDir" if [ -n "$secondaryArchSuffix" ]; then - rm $binDir/lz4 - rm $binDir/lz4c - rm $binDir/lz4cat - rm $binDir/unlz4 + rm "$binDir"/lz4 + rm "$binDir"/lz4c + rm "$binDir"/lz4cat + rm "$binDir"/unlz4 rmdir "$binDir" fi @@ -103,13 +102,6 @@ INSTALL() TEST() { - testTarget=test - - if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then - # gcc2 can't build all tests, so let's run the basic set only - testTarget=check - fi - LIBRARY_PATH="$sourceDir/libs${LIBRARY_PATH:+:$LIBRARY_PATH}" \ - make $testTarget + make check test } diff --git a/app-arch/lz4/patches/lz4-1.8.2.patchset b/app-arch/lz4/patches/lz4-1.8.2.patchset deleted file mode 100644 index f11709012..000000000 --- a/app-arch/lz4/patches/lz4-1.8.2.patchset +++ /dev/null @@ -1,61 +0,0 @@ -From a5412e8c0b0223ac84aca3707f77b86b8b9bd89d Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Tue, 5 Aug 2014 17:14:07 +0000 -Subject: haiku patch - - -diff --git a/Makefile b/Makefile -index 86613fd..4afd03f 100644 ---- a/Makefile -+++ b/Makefile -@@ -89,7 +89,7 @@ clean: - #----------------------------------------------------------------------------- - # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets - #----------------------------------------------------------------------------- --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) -+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku)) - HOST_OS = POSIX - - .PHONY: install uninstall -diff --git a/lib/Makefile b/lib/Makefile -index abb6c07..d2ce31d 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -123,7 +123,7 @@ clean: - #----------------------------------------------------------------------------- - # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets - #----------------------------------------------------------------------------- --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) -+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku)) - - .PHONY: listL120 - listL120: # extract lines >= 120 characters in *.{c,h}, by Takayuki Matsuoka (note : $$, for Makefile compatibility) -diff --git a/programs/Makefile b/programs/Makefile -index 72bdcaa..655efbc 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -109,7 +109,7 @@ clean: - #----------------------------------------------------------------------------- - # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets - #----------------------------------------------------------------------------- --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) -+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku)) - - unlz4: lz4 - ln -s lz4 unlz4 -diff --git a/tests/Makefile b/tests/Makefile -index d238561..ac86c3e 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -129,7 +129,7 @@ checkTag: checkTag.c $(LZ4DIR)/lz4.h - #----------------------------------------------------------------------------- - # validated only for Linux, OSX, BSD, Hurd and Solaris targets - #----------------------------------------------------------------------------- --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) -+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku)) - - MD5:=md5sum - ifneq (,$(filter $(shell uname), Darwin )) --- -2.7.0 -