diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-06-28 11:27:31 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-06-28 11:27:31 +0000 |
| commit | ddc0a9d01ad4a574724d1fdf54cbeedf07501aaf (patch) | |
| tree | 3cc1ca99668e015a25bf79185ada820b57001f63 | |
| parent | cad24d7d5c18c4aa87368fa21925d2c7df3ef11a (diff) | |
e2fsprogs: change the so-version of libcom_err to prevent conflicts, move it into the libext2fs package, get rid of the pthread dependency
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37076 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/utils/e2fsprogs/Makefile | 23 | ||||
| -rw-r--r-- | package/utils/e2fsprogs/patches/003-com_err_version.patch | 13 |
2 files changed, 19 insertions, 17 deletions
diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index e40f280b38..0dca9808dd 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -41,7 +41,6 @@ endef define Package/libext2fs $(call Package/e2fsprogs/Default) - DEPENDS:=+libcom_err SECTION:=libs CATEGORY:=Libraries TITLE:=ext2/3/4 filesystem library @@ -51,18 +50,6 @@ define Package/libext2fs/description libext2fs is a library which can access ext2, ext3 and ext4 filesystems. endef -define Package/libcom_err -$(call Package/e2fsprogs/Default) - DEPENDS:=+libpthread - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Common error description library -endef - -define Package/libcom_err/description - libcom_err is a library providing common error descriptions -endef - define Package/tune2fs $(call Package/e2fsprogs) TITLE:=Ext2 Filesystem tune utility @@ -83,6 +70,8 @@ endef TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections +CONFIGURE_VARS += \ + ac_cv_lib_pthread_sem_init=no CONFIGURE_ARGS += \ --disable-testio-debug \ @@ -130,13 +119,14 @@ define Package/e2fsprogs/install endef define Package/libcom_err/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* $(1)/usr/lib/ endef define Package/libext2fs/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libext2fs.so.* $(1)/usr/lib/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libext2fs.so.* \ + $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* \ + $(1)/usr/lib/ endef define Package/libext2fs/install_lib @@ -161,7 +151,6 @@ endef $(eval $(call BuildPackage,e2fsprogs)) $(eval $(call BuildPackage,libext2fs)) -$(eval $(call BuildPackage,libcom_err)) $(eval $(call BuildPackage,tune2fs)) $(eval $(call BuildPackage,resize2fs)) $(eval $(call BuildPackage,badblocks)) diff --git a/package/utils/e2fsprogs/patches/003-com_err_version.patch b/package/utils/e2fsprogs/patches/003-com_err_version.patch new file mode 100644 index 0000000000..62f1e08e71 --- /dev/null +++ b/package/utils/e2fsprogs/patches/003-com_err_version.patch @@ -0,0 +1,13 @@ +--- a/lib/et/Makefile.in ++++ b/lib/et/Makefile.in +@@ -25,8 +25,8 @@ SHARE_FILES= et_c.awk et_h.awk + LIBRARY= libcom_err + LIBDIR= et + +-ELF_VERSION = 2.1 +-ELF_SO_VERSION = 2 ++ELF_VERSION = 0.0 ++ELF_SO_VERSION = 0 + ELF_IMAGE = libcom_err + ELF_MYDIR = et + ELF_INSTALL_DIR = $(root_libdir) |