From 4de3b44c2834233f63677012787755dbd09eca67 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 25 Mar 2017 14:08:42 +0100
Subject: lz4: update to 1.7.5

---
 package/lz4/Makefile                        | 14 +++++++-------
 package/lz4/patches/patch-lib_Makefile      | 11 -----------
 package/lz4/patches/patch-programs_Makefile | 20 --------------------
 3 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 package/lz4/patches/patch-lib_Makefile
 delete mode 100644 package/lz4/patches/patch-programs_Makefile

(limited to 'package/lz4')

diff --git a/package/lz4/Makefile b/package/lz4/Makefile
index 712fed62b..e26116eee 100644
--- a/package/lz4/Makefile
+++ b/package/lz4/Makefile
@@ -4,20 +4,18 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		lz4
-PKG_VERSION:=		131
+PKG_VERSION:=		1.7.5
 PKG_RELEASE:=		1
-PKG_HASH:=		9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed
+PKG_HASH:=		0190cacd63022ccb86f44fa5041dc6c3804407ad61550ca21c382827319e7e7e
 PKG_DESCR:=		compression utility
 PKG_SECTION:=		app/archive
 PKG_DEPENDS:=		liblz4
-PKG_URL:=		https://code.google.com/p/lz4/
-PKG_SITES:=		https://github.com/Cyan4973/lz4/archive/
+PKG_URL:=		http://lz4.github.io/lz4/
+PKG_SITES:=		https://github.com/lz4/lz4/archive/
 PKG_OPTS:=		dev
 PKG_LIBNAME:=		liblz4
-PKG_OPTS:=		dev
 
-DISTFILES:=		r${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}-r${PKG_VERSION}
+DISTFILES:=		v$(PKG_VERSION).tar.gz
 
 PKG_SUBPKGS:=		LZ4 LIBLZ4
 PKGSD_LIBLZ4:=		lz4 compression library
@@ -32,6 +30,8 @@ $(eval $(call PKG_template,LIBLZ4,liblz4,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_L
 
 HOST_STYLE:=		manual
 CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		PREFIX=/usr
+HOST_XAKE_FLAGS+=	PREFIX=/usr
 
 host-build:
 	(cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
diff --git a/package/lz4/patches/patch-lib_Makefile b/package/lz4/patches/patch-lib_Makefile
deleted file mode 100644
index 168b1870c..000000000
--- a/package/lz4/patches/patch-lib_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lz4-r131.orig/lib/Makefile	2015-06-29 11:48:37.000000000 +0200
-+++ lz4-r131/lib/Makefile	2016-09-24 02:53:43.222879939 +0200
-@@ -38,7 +38,7 @@ LIBVER_PATCH=`sed -n '/define LZ4_VERSIO
- LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
- 
- DESTDIR?=
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
- CFLAGS ?= -O3
- CFLAGS += -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wcast-qual -Wstrict-prototypes -pedantic -DXXH_NAMESPACE=LZ4_
- 
diff --git a/package/lz4/patches/patch-programs_Makefile b/package/lz4/patches/patch-programs_Makefile
deleted file mode 100644
index ce43646da..000000000
--- a/package/lz4/patches/patch-programs_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- lz4-r131.orig/programs/Makefile	2015-06-29 11:48:37.000000000 +0200
-+++ lz4-r131/programs/Makefile	2016-09-24 02:52:44.112577985 +0200
-@@ -37,7 +37,7 @@
- RELEASE?= r131
- 
- DESTDIR?=
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
- CFLAGS ?= -O3
- CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\"
- FLAGS  := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-@@ -70,7 +70,7 @@ m32: lz4c32 fullbench32 fuzzer32 framete
- 
- bins: lz4 lz4c fullbench fuzzer frametest datagen
- 
--all: bins m32
-+all: bins
- 
- lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
- 	$(CC)      $(FLAGS) $^ -o $@$(EXT)
-- 
cgit v1.2.3