Changeset 8498


Ignore:
Timestamp:
2007-08-27T01:33:28+02:00 (10 years ago)
Author:
nico
Message:

package/util-linux fixes:

  • don't use Build/Configure/Default since it is not an autoconf based package
  • fix opt flags passed more than once
  • move DEPENDS:=@!LINUX_2_6_ETRAX in shared Package/util-linux/Default
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/util-linux/Makefile

    r8495 r8498  
    2222  SECTION:=utils 
    2323  CATEGORY:=Utilities 
     24  DEPENDS:=@!LINUX_2_6_ETRAX 
    2425  URL:=http://www.kernel.org/pub/linux/utils/util-linux/ 
    2526endef 
     
    2829  $(call Package/util-linux/Default) 
    2930  TITLE:=Partition table manipulation utility 
    30   DEPENDS:=@!LINUX_2_6_ETRAX 
    3131  DESCRIPTION:=\ 
    3232        This package contains a utility for managing disk partition tables. 
     
    3737  $(call Package/util-linux/Default) 
    3838  TITLE:=Partition table manipulation utility 
    39   DEPENDS:=+libncurses @!LINUX_2_6_ETRAX 
     39  DEPENDS+= +libncurses 
    4040  DESCRIPTION:=\ 
    4141        This package contains a utility for managing disk partition tables. 
     
    4646  $(call Package/util-linux/Default) 
    4747  TITLE:=Loopback devices setup and control utility 
    48   DEPENDS:=@!LINUX_2_6_ETRAX 
    4948  DESCRIPTION:=\ 
    5049        This package contains a utility for managing loopback devices. 
     
    5453  $(call Package/util-linux/Default) 
    5554  TITLE:=Swap space management utilities 
    56   DEPENDS:=@!LINUX_2_6_ETRAX 
    5755  DESCRIPTION:=\ 
    5856        This package contains a collection of tools for managing swap space: \\\ 
     
    6563  $(call Package/util-linux/Default) 
    6664  TITLE:=Utilities for managing the hardware clock 
    67   DEPENDS:=@!LINUX_2_6_ETRAX 
    6865  DESCRIPTION:=\ 
    6966         This package contains a utility for managing the hardware clock 
    7067endef 
    7168 
    72 TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib 
     69define Build/Configure 
     70        # this is NOT GNU configure! 
     71        ( cd $(PKG_BUILD_DIR); \ 
     72                CC="$(TARGET_CC)" \ 
     73                CFLAGS="$(TARGET_CPPFLAGS)" \ 
     74                LDFLAGS="$(TARGET_LDFLAGS)" \ 
     75                ./configure \ 
     76        ); 
     77endef 
     78 
    7379define Build/Compile 
    74         $(call Build/Compile/Default, \ 
     80        $(MAKE) -C $(PKG_BUILD_DIR) \ 
    7581                OPT="$(TARGET_CFLAGS)" \ 
    7682                INSTALLSUID="install -m 4755" \ 
    7783                DESTDIR="$(PKG_INSTALL_DIR)" \ 
    78                 all install \ 
    79         ) 
     84                all install 
    8085endef 
    8186 
Note: See TracChangeset for help on using the changeset viewer.