Changeset 21830


Ignore:
Timestamp:
2010-06-17T21:49:23+02:00 (7 years ago)
Author:
bud
Message:
  • bump version to 2010.5.22 for all uclibc versions
  • minor fixes
File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/ntfs-3g/Makefile

    r20291 r21830  
    99 
    1010PKG_NAME:=ntfs-3g 
    11 PKG_RELEASE:=3 
     11PKG_RELEASE:=4 
    1212 
    13 PKG_UCLIBC_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION)) 
    14 ifneq (,$(or $(findstring !0.9.29,!$(PKG_UCLIBC_VERSION)),$(findstring !0.9.30.1!,!$(PKG_UCLIBC_VERSION)!) )) 
    15         PKG_VERSION:=2010.1.16 
    16 else 
    17         PKG_VERSION:=2010.3.6 
    18 endif 
     13PKG_VERSION:=2010.5.22 
     14 
     15## 2010.3.6 needs a recent uclibc 0.9.30.2 or greater 
     16## this has been fixed in 2010.5.16, keeping this in case this happens again 
     17#PKG_UCLIBC_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION)) 
     18#ifneq (,$(or $(findstring !0.9.29,!$(PKG_UCLIBC_VERSION)),$(findstring !0.9.30.1!,!$(PKG_UCLIBC_VERSION)!) )) 
     19#       PKG_VERSION:=2010.1.16 
     20#endif 
    1921 
    2022PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz 
     
    2325PKG_MD5SUM_2010.1.16:=e104c914e8d7d29ee83e63d46afbba25 
    2426PKG_MD5SUM_2010.3.6:=12ce21aa044c6068a4df6e8cbd3c5cfa 
    25 PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION)) 
     27PKG_MD5SUM_2010.5.16:=aeff7659a4943c9223d79116f051a863 
     28PKG_MD5SUM_2010.5.22:=caa08c73220a7106c76f697b7a7915ec 
     29PKG_MD5SUM:=$(PKG_MD5SUM_$(PKG_VERSION)) 
    2630 
    2731PKG_FIXUP:=libtool 
    2832PKG_INSTALL:=1 
     33 
     34# release contains fuseext/int hint 
     35PKG_RELEASE:=$(PKG_RELEASE)$(if $(CONFIG_PACKAGE_NTFS-3G_USE_LIBFUSE),-fuseext,-fuseint) 
     36 
     37# define build dir, respect fuseext/int 
     38PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE) 
    2939 
    3040include $(INCLUDE_DIR)/package.mk 
     
    6070define Package/ntfs-3g/config 
    6171config PACKAGE_NTFS-3G_USE_LIBFUSE 
    62         bool "use external FUSE library (package libfuse)" 
    63         depends PACKAGE_ntfs-3g 
     72        bool "use external FUSE library, selects package libfuse" 
     73        default n 
     74        depends on PACKAGE_ntfs-3g 
    6475        ---help--- 
    65         Ntfs-3g by default uses a minimalized lite version of FUSE.  
    66         If libfuse is part of your filesystem anyway (because of sshfs, owfs  
    67         etc.) it makes sense to activate this option and save some kilobytes  
     76        Ntfs-3g by default uses a minimalized lite version of FUSE. 
     77        If libfuse is part of your filesystem anyway (because of sshfs, owfs 
     78        etc.) it makes sense to activate this option and save some kilobytes 
    6879        of space. 
     80 
    6981endef 
    7082 
     
    90102        --enable-static 
    91103 
    92 # insert config with external libfuse 
     104# configure/make according selection 
    93105ifdef CONFIG_PACKAGE_NTFS-3G_USE_LIBFUSE 
    94         CONFIGURE_ARGS += --with-fuse=external  
    95         PKG_RELEASE:=$(PKG_RELEASE)-fuseext 
     106        CONFIGURE_ARGS += --with-fuse=external 
     107        TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include/fuse $(TARGET_CPPFLAGS) 
    96108else 
    97109        CONFIGURE_ARGS += --with-fuse=internal 
    98         TARGET_CPPFLAGS:=-I../include/fuse-lite $(TARGET_CPPFLAGS)  
    99         PKG_RELEASE:=$(PKG_RELEASE)-fuseint 
     110        TARGET_CPPFLAGS:=-I../include/fuse-lite $(TARGET_CPPFLAGS) 
    100111endif 
     112 
     113# redefine prepare to extract to our build dir 
     114define Build/Prepare 
     115        rm -rf $(PKG_BUILD_DIR)/ 
     116        mkdir -p $(PKG_BUILD_DIR)/ 
     117        $(TAR) -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip 1 
     118endef 
    101119 
    102120define Build/InstallDev 
     
    104122        $(CP)   $(PKG_INSTALL_DIR)/usr/include/ntfs-3g $(1)/usr/include/ 
    105123        $(INSTALL_DIR) $(1)/usr/lib 
    106         $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.{a,so*} $(1)/usr/lib/ 
     124        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.{la,a,so*} $(1)/usr/lib/ 
    107125endef 
    108126 
Note: See TracChangeset for help on using the changeset viewer.