From b54a88d64f68b7b0df85887bdc27967e6ee1a678 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 24 Sep 2016 22:17:18 +0200 Subject: lz4: update to 131 --- package/lz4/Makefile | 4 ++-- package/lz4/patches/patch-Makefile | 37 ----------------------------- package/lz4/patches/patch-lib_Makefile | 11 +++++++++ package/lz4/patches/patch-programs_Makefile | 36 ++++++++++++---------------- 4 files changed, 28 insertions(+), 60 deletions(-) delete mode 100644 package/lz4/patches/patch-Makefile create mode 100644 package/lz4/patches/patch-lib_Makefile (limited to 'package/lz4') diff --git a/package/lz4/Makefile b/package/lz4/Makefile index ee4ec2367..712fed62b 100644 --- a/package/lz4/Makefile +++ b/package/lz4/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lz4 -PKG_VERSION:= 119 +PKG_VERSION:= 131 PKG_RELEASE:= 1 -PKG_HASH:= 1deb77e5cc7b41422c02dd3d56e7e0f0deb20723a54cad4ad5a65fb1f4805b1c +PKG_HASH:= 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed PKG_DESCR:= compression utility PKG_SECTION:= app/archive PKG_DEPENDS:= liblz4 diff --git a/package/lz4/patches/patch-Makefile b/package/lz4/patches/patch-Makefile deleted file mode 100644 index 56d9ae37c..000000000 --- a/package/lz4/patches/patch-Makefile +++ /dev/null @@ -1,37 +0,0 @@ ---- lz4-r118.orig/Makefile 2014-06-26 11:36:13.000000000 +0200 -+++ lz4-r118/Makefile 2014-06-30 07:42:30.000000000 +0200 -@@ -39,8 +39,8 @@ LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$ - - DESTDIR= - PREFIX = /usr --CC := $(CC) --CFLAGS+= -I. -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" -+CC ?= $(CC) -+CFLAGS+= -I. -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" - - LIBDIR?= $(PREFIX)/lib - INCLUDEDIR=$(PREFIX)/include -@@ -55,19 +55,10 @@ else - EXT = - endif - --# OS X linker doesn't support -soname, and use different extension --# see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html --ifeq ($(shell uname), Darwin) -- SONAME_FLAGS = -- SHARED_EXT = dylib -- SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT) -- SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT) --else -- SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR) -- SHARED_EXT = so -- SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR) -- SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) --endif -+SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR) -+SHARED_EXT = so -+SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR) -+SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) - - TEXT = lz4.c lz4.h lz4hc.c lz4hc.h \ - lz4_format_description.txt Makefile NEWS LICENSE README.md \ diff --git a/package/lz4/patches/patch-lib_Makefile b/package/lz4/patches/patch-lib_Makefile new file mode 100644 index 000000000..168b1870c --- /dev/null +++ b/package/lz4/patches/patch-lib_Makefile @@ -0,0 +1,11 @@ +--- 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 index 81d7e6470..ce43646da 100644 --- a/package/lz4/patches/patch-programs_Makefile +++ b/package/lz4/patches/patch-programs_Makefile @@ -1,26 +1,20 @@ ---- lz4-r118.orig/programs/Makefile 2014-06-26 11:36:13.000000000 +0200 -+++ lz4-r118/programs/Makefile 2014-06-30 08:09:52.000000000 +0200 -@@ -33,8 +33,8 @@ - RELEASE=r118 - DESTDIR= - PREFIX=/usr --CC:=$(CC) --CFLAGS+= -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" -+CC?=$(CC) -+CFLAGS+= -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" - FLAGS= -I.. $(CFLAGS) +--- 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 - BINDIR=$(PREFIX)/bin -@@ -67,10 +67,10 @@ endif + 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 - default: lz4 lz4c + bins: lz4 lz4c fullbench fuzzer frametest datagen --all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 datagen -+all: lz4 lz4c +-all: bins m32 ++all: bins - lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c -- $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -+ $(CC) $(FLAGS) $^ -o $@$(EXT) - - lz4c : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c + 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