From 683e1dfb5c92540f102bb519579c172889030eab Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 31 Mar 2014 09:33:18 +0200
Subject: update bison, use static build for bzip2

---
 package/bison/Makefile |  6 ++----
 package/bzip2/Makefile | 11 +++--------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/package/bison/Makefile b/package/bison/Makefile
index 02c3ca31f..43044f2fb 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -4,18 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bison
-PKG_VERSION:=		3.0.1
+PKG_VERSION:=		3.0.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		032a7b7b9f1a6e278ccde73f82cec5c2
-PKG_DESCR:=		GNU parser generator
+PKG_DESCR:=		parser generator
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		m4-host flex-host bison-host
 HOST_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.gnu.org/software/bison/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-
 include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index b73fde65f..c4b6ebe48 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -32,6 +32,7 @@ $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2},${PKG_OPTS}))
 
 HOST_STYLE:=		manual
+HOST_MAKE_FILE:=	Makefile
 MAKE_FILE:=		Makefile-libbz2_so
 CONFIG_STYLE:=		manual
 TARGET_CFLAGS+=		-fPIC 
@@ -39,18 +40,12 @@ XAKE_FLAGS+=		PREFIX=${WRKINST}/usr CROSS_COMPILE=1
 INSTALL_STYLE:=		manual
 
 host-build:
-	(cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+	(cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${HOST_MAKE_FILE} \
 		PREFIX=${HOST_WRKINST}/usr ${HOST_ALL_TARGET})
 
 bzip2-hostinstall:
 	${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin
-	${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/lib
-	${INSTALL_DIR} $(STAGING_HOST_DIR)/usr/include
-	$(INSTALL_BIN) ${WRKBUILD}/bzip2-shared ${STAGING_HOST_DIR}/usr/bin/bzip2
-	$(CP) ${WRKBUILD}/libbz2.so* \
-		${STAGING_HOST_DIR}/usr/lib
-	(cd ${STAGING_HOST_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
-	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_HOST_DIR)/usr/include
+	$(INSTALL_BIN) ${WRKBUILD}/bzip2 ${STAGING_HOST_DIR}/usr/bin/bzip2
 
 libbz2-install:
 	${INSTALL_DIR} ${IDIR_LIBBZ2}/usr/lib
-- 
cgit v1.2.3