Przeglądaj źródła

fix lvm build, remove util-linux hackish way to generate pc files

Waldemar Brodkorb 11 lat temu
rodzic
commit
757783189a
1 zmienionych plików z 10 dodań i 11 usunięć
  1. 10 11
      package/util-linux/Makefile

+ 10 - 11
package/util-linux/Makefile

@@ -5,13 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		util-linux
 PKG_VERSION:=		2.24.2
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		3f191727a0d28f7204b755cf1b6ea0aa
 PKG_DESCR:=		basic utilities
 PKG_SECTION:=		base/apps
-PKG_BUILDDEP:=		ncurses pam
+PKG_BUILDDEP:=		autotool ncurses pam
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.24/
-PKG_NOPARALLEL:=	1
 PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!m68k
@@ -59,6 +58,7 @@ $(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
 TARGET_LDFLAGS+=	-ltinfo
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		have_scanf_alloc_modifier=yes \
 			scanf_cv_alloc_modifier=ms
 CONFIGURE_ARGS+=	--disable-use-tty-group \
@@ -71,30 +71,29 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--enable-libblkid \
 			--enable-libmount \
 			--enable-mount \
-			--with-ncurses=$(STAGING_TARGET_DIR)/usr/include \
-			--libdir=/usr/lib
+			--with-ncurses=$(STAGING_TARGET_DIR)/usr/include
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 
 fdisk-install:
 	${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
-	${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/fdisk ${IDIR_FDISK}/usr/sbin
 
 cfdisk-install:
 	${INSTALL_DIR} ${IDIR_CFDISK}/usr/sbin
-	${CP} ${WRKINST}/sbin/cfdisk ${IDIR_FDISK}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/cfdisk ${IDIR_FDISK}/usr/sbin
 
 sfdisk-install:
 	${INSTALL_DIR} ${IDIR_SFDISK}/usr/sbin
-	${CP} ${WRKINST}/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin
 
 losetup-install:
 	${INSTALL_DIR} ${IDIR_LOSETUP}/usr/sbin
-	${CP} ${WRKINST}/sbin/losetup ${IDIR_LOSETUP}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/losetup ${IDIR_LOSETUP}/usr/sbin
 
 swap-utils-install:
 	${INSTALL_DIR} ${IDIR_SWAP_UTILS}/usr/sbin
-	${CP} ${WRKINST}/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin
-	${CP} ${WRKINST}/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin
+	${CP} ${WRKINST}/usr/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin
 
 mount-install:
 	${INSTALL_DIR} ${IDIR_MOUNT}/bin