From 8f16335443a322578274737c8d80ce557e4d2656 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 12 Aug 2013 10:30:50 +0200
Subject: add xmbc package for raspberry-pi target

---
 package/bzip2/Makefile                         | 18 +++++++++++++++++-
 package/bzip2/patches/patch-Makefile-libbz2_so | 15 +++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 package/bzip2/patches/patch-Makefile-libbz2_so

(limited to 'package/bzip2')

diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index 9bcb61af5..b2ed92985 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -9,19 +9,35 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		00b516f4704d4a7cb50a1d97e6e8e15b
 PKG_DESCR:=		bzip2 compression utility
 PKG_SECTION:=		archive
+PKG_DEPENDS:=		libbz2
 PKG_URL:=		http://www.bzip.org/
 PKG_SITES:=		http://www.bzip.org/${PKG_VERSION}/
+PKG_SUBPKGS:=		BZIP2 LIBBZ2
+
+PKGSD_LIBBZ2:=		bzip2 compression library
+PKGSC_LIBBZ2:=		libs
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2}))
 
+MAKE_FILE:=		Makefile-libbz2_so
 CONFIG_STYLE:=		manual
 TARGET_CFLAGS+=		-fPIC
 XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
+INSTALL_STYLE:=		manual
+
+libbz2-install:
+	${INSTALL_DIR} ${IDIR_LIBBZ2}/usr/lib
+	$(CP) ${WRKBUILD}/libbz2.so* \
+		${IDIR_LIBBZ2}/usr/lib
+	$(CP) ${WRKBUILD}/libbz2.so* \
+		${STAGING_DIR}/usr/lib
+	(cd ${STAGING_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
 
 bzip2-install:
 	${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/bzip2 ${IDIR_BZIP2}/usr/bin
+	${INSTALL_BIN} ${WRKBUILD}/bzip2-shared ${IDIR_BZIP2}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so
new file mode 100644
index 000000000..e71dab136
--- /dev/null
+++ b/package/bzip2/patches/patch-Makefile-libbz2_so
@@ -0,0 +1,15 @@
+--- bzip2-1.0.6.orig/Makefile-libbz2_so	2010-09-11 01:07:52.000000000 +0200
++++ bzip2-1.0.6/Makefile-libbz2_so	2013-07-30 14:15:29.000000000 +0200
+@@ -22,9 +22,10 @@
+ 
+ 
+ SHELL=/bin/sh
+-CC=gcc
++CC?=gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS?=
++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES)
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
-- 
cgit v1.2.3