From b465429a7e4a1f336947ec59ef5f660db85022f0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 20 Nov 2009 20:23:01 +0100
Subject: fix more uclibc bulk build errors and add sfdisk/parted

- add sfdisk and parted for nfsroot installations to cfdisk
- fix more uclibc bulk build errors
---
 package/e2fsprogs/Makefile | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'package/e2fsprogs/Makefile')

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 3230b61df..96ec1ce99 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -5,36 +5,36 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		e2fsprogs
 PKG_VERSION:=		1.41.9
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		52f60a9e19a02f142f5546f1b5681927
 PKG_DESCR:=		Ext2/3/4 filesystem utilities
 PKG_SECTION:=		admin
 PKG_URL:=		http://e2fsprogs.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
 
-PKG_DESCR_1:=		UUID library
-PKG_SECTION_1:=		libs
-PKG_DESCR_2:=		Common error library
-PKG_SECTION_2:=		libs
-PKG_DESCR_3:=		Libblkid
-PKG_SECTION_3:=		libs
+PKG_DESCR_UUID:=	UUID library
+PKG_SECTION_UUID:=	libs
+PKG_DESCR_COM_ERR:=	Common error library
+PKG_SECTION_COM_ERR:=	libs
+PKG_DESCR_BLKID:=	Libblkid
+PKG_SECTION_BLKID:=	libs
 PKG_DESCR_SS:=		Subsystem command parsing library
 PKG_SECTION_SS:=	libs
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION_1}))
-$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UUID},${PKG_SECTION_UUID}))
+$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_COM_ERR},${PKG_SECTION_COM_ERR}))
 $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SS},${PKG_SECTION_SS}))
-$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION_3}))
+$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_BLKID},${PKG_SECTION_BLKID}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-elf-shlibs \
 			--disable-tls \
 			--enable-dynamic-e2fsck
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 INSTALL_TARGET+=	install-libs
 
 pre-build:
@@ -54,7 +54,7 @@ post-install:
 		${IDIR_E2FSPROGS}/usr/lib/
 	# subpackage libblkid
 	${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libblkid.so.* \
+	${CP} ${WRKINST}/usr/lib/libblkid.so* \
 		${IDIR_LIBBLKID}/usr/lib/
 	# subpackage libcom_err
 	${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib
@@ -66,7 +66,7 @@ post-install:
 		${IDIR_LIBSS}/usr/lib/
 	# subpackage libuuid
 	${INSTALL_DIR} ${IDIR_LIBUUID}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libuuid.so.* \
+	${CP} ${WRKINST}/usr/lib/libuuid.so* \
 		${IDIR_LIBUUID}/usr/lib/
 	# install some headers/apps explicitely
 	${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid
-- 
cgit v1.2.3