X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a5e1c6b8a3fd9dee8efe7cadbba75697d5c087af..b4c2371ebb2af4f08a7928bba82a3c3f77989f3e:/package/e2fsprogs/Makefile

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index b2c1ba306..9192650c4 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 \\\
@@ -38,6 +38,16 @@ define Package/libuuid
   URL:=http://e2fsprogs.sourceforge.net/
 endef
 
+define Package/libblkid
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=block device id library
+  DESCRIPTION:=\
+  	The blkid library which allows system programs like fsck and mount to quickly\\\
+	and easily find block devices by filesystem UUID and LABEL.
+  URL:=http://e2fsprogs.sourceforge.net/
+endef
+
 define Package/tune2fs
   $(call Package/e2fsprogs)
   TITLE:=Ext2 Filesystem tune utility
@@ -59,6 +69,11 @@ CONFIGURE_ARGS += \
 	--enable-elf-shlibs \
 	--enable-dynamic-e2fsck
 
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/config/
+endef
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/util \
 		BUILDCC="$(HOSTCC)" \
@@ -77,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
@@ -86,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
@@ -94,6 +118,11 @@ define Package/libuuid/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.so.* $(1)/usr/lib/
 endef
 
+define Package/libblkid/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.so.* $(1)/usr/lib/
+endef
+
 define Package/tune2fs/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/
@@ -106,5 +135,6 @@ endef
 
 $(eval $(call BuildPackage,e2fsprogs))
 $(eval $(call BuildPackage,libuuid))
+$(eval $(call BuildPackage,libblkid))
 $(eval $(call BuildPackage,tune2fs))
 $(eval $(call BuildPackage,resize2fs))