From 8b2ea5fd6a65f35d670eba5c44a7f7f9d561c131 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 30 Jun 2014 08:40:35 +0200
Subject: add support for lz4 compressed kernel and initramfs

---
 package/lz4/Makefile                             |  9 ++++++++
 package/lz4/patches/patch-Makefile.orig          | 26 ------------------------
 package/lz4/patches/patch-programs_Makefile.orig | 22 --------------------
 3 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 package/lz4/patches/patch-Makefile.orig
 delete mode 100644 package/lz4/patches/patch-programs_Makefile.orig

(limited to 'package/lz4')

diff --git a/package/lz4/Makefile b/package/lz4/Makefile
index 7ad0f69e3..e6faaa7b2 100644
--- a/package/lz4/Makefile
+++ b/package/lz4/Makefile
@@ -30,8 +30,17 @@ $(eval $(call HOST_template,LZ4,lz4,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LZ4,lz4,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBLZ4,liblz4,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBLZ4},${PKGSD_LIBLZ4},${PKGSC_LIBLZ4},${PKG_OPTS}))
 
+HOST_STYLE:=		manual
 CONFIG_STYLE:=		manual
 
+host-build:
+	(cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+		${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET}) $(MAKE_TRACE)
+
+lz4-hostinstall:
+	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+		${HOST_FAKE_FLAGS} DESTDIR='${STAGING_HOST_DIR}' ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
+
 lz4-install:
 	${INSTALL_DIR} ${IDIR_LZ4}/usr/bin
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_LZ4}/usr/bin
diff --git a/package/lz4/patches/patch-Makefile.orig b/package/lz4/patches/patch-Makefile.orig
deleted file mode 100644
index 5102f1128..000000000
--- a/package/lz4/patches/patch-Makefile.orig
+++ /dev/null
@@ -1,26 +0,0 @@
---- lz4-r118.orig/Makefile	2014-06-26 11:36:13.000000000 +0200
-+++ lz4-r118/Makefile	2014-06-30 07:41:17.000000000 +0200
-@@ -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-programs_Makefile.orig b/package/lz4/patches/patch-programs_Makefile.orig
deleted file mode 100644
index 02e153ed9..000000000
--- a/package/lz4/patches/patch-programs_Makefile.orig
+++ /dev/null
@@ -1,22 +0,0 @@
---- lz4-r118.orig/programs/Makefile	2014-06-26 11:36:13.000000000 +0200
-+++ lz4-r118/programs/Makefile	2014-06-30 07:44:45.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)
- 
- BINDIR=$(PREFIX)/bin
-@@ -67,7 +67,7 @@ endif
- 
- default: lz4 lz4c
- 
--all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 datagen
-+all: lz4 lz4c
- 
- lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c
- 	$(CC)      $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
-- 
cgit v1.2.3