Changeset 37076


Ignore:
Timestamp:
2013-06-28T13:27:31+02:00 (5 years ago)
Author:
nbd
Message:

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@…>

Location:
trunk/package/utils/e2fsprogs
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/utils/e2fsprogs/Makefile

    r37075 r37076  
    4242define Package/libext2fs 
    4343$(call Package/e2fsprogs/Default) 
    44   DEPENDS:=+libcom_err 
    4544  SECTION:=libs 
    4645  CATEGORY:=Libraries 
     
    5049define Package/libext2fs/description 
    5150 libext2fs is a library which can access ext2, ext3 and ext4 filesystems. 
    52 endef 
    53  
    54 define Package/libcom_err 
    55 $(call Package/e2fsprogs/Default) 
    56   DEPENDS:=+libpthread 
    57   SECTION:=libs 
    58   CATEGORY:=Libraries 
    59   TITLE:=Common error description library 
    60 endef 
    61  
    62 define Package/libcom_err/description 
    63  libcom_err is a library providing common error descriptions 
    6451endef 
    6552 
     
    8471TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections 
    8572 
     73CONFIGURE_VARS += \ 
     74        ac_cv_lib_pthread_sem_init=no 
    8675 
    8776CONFIGURE_ARGS += \ 
     
    131120 
    132121define Package/libcom_err/install 
    133         $(INSTALL_DIR) $(1)/usr/lib 
    134         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* $(1)/usr/lib/ 
    135122endef 
    136123 
    137124define Package/libext2fs/install 
    138125        $(INSTALL_DIR) $(1)/usr/lib 
    139         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libext2fs.so.* $(1)/usr/lib/ 
     126        $(CP) \ 
     127                $(PKG_INSTALL_DIR)/usr/lib/libext2fs.so.* \ 
     128                $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* \ 
     129                $(1)/usr/lib/ 
    140130endef 
    141131 
     
    162152$(eval $(call BuildPackage,e2fsprogs)) 
    163153$(eval $(call BuildPackage,libext2fs)) 
    164 $(eval $(call BuildPackage,libcom_err)) 
    165154$(eval $(call BuildPackage,tune2fs)) 
    166155$(eval $(call BuildPackage,resize2fs)) 
Note: See TracChangeset for help on using the changeset viewer.