diff options
| author | Nicolas Thill <nico@openwrt.org> | 2007-08-25 15:52:31 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2007-08-25 15:52:31 +0000 |
| commit | 68e129691ffbbd4cfda5d3a1a00c0957fccd180c (patch) | |
| tree | 9025157f7f7fc5ac44a2f2c2cc2cc89745237e4a | |
| parent | 615a81cb65487f8a1d2285209aba5109abb8178a (diff) | |
| download | master-31e0f0ae-68e129691ffbbd4cfda5d3a1a00c0957fccd180c.tar.gz master-31e0f0ae-68e129691ffbbd4cfda5d3a1a00c0957fccd180c.tar.bz2 master-31e0f0ae-68e129691ffbbd4cfda5d3a1a00c0957fccd180c.zip | |
e2fsprogs fixes: - don't bundle libblkid shared lib in e2fsprogs, add a dependency instead - remove references to host dev files in pkgconfig files - add Build/UninstallDev
SVN-Revision: 8486
| -rw-r--r-- | package/e2fsprogs/Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 633b555127..9192650c47 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -22,7 +22,7 @@ define Package/e2fsprogs SECTION:=utils CATEGORY:=Utilities TITLE:=Ext2/3 filesystem utilities - DEPENDS:=+libuuid + DEPENDS:=+libblkid +libuuid DESCRIPTION:=\ This package contains essential ext2 filesystem utilities which consists of \\\ e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2 \\\ @@ -92,6 +92,15 @@ define Build/InstallDev BUILDCC="$(HOSTCC)" \ DESTDIR="$(STAGING_DIR)" \ install-libs + $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc + $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc +endef + +define Build/UninstallDev + -$(MAKE) -C $(PKG_BUILD_DIR) \ + BUILDCC="$(HOSTCC)" \ + DESTDIR="$(STAGING_DIR)" \ + uninstall-libs endef define Package/e2fsprogs/install @@ -101,7 +110,7 @@ define Package/e2fsprogs/install ln -sf mke2fs $(1)/usr/sbin/mkfs.ext2 ln -sf mke2fs $(1)/usr/sbin/mkfs.ext3 $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(foreach lib,blkid com_err e2p ext2fs,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/ + $(CP) $(foreach lib,com_err e2p ext2fs,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/ endef define Package/libuuid/install |