Ignore:
Timestamp:
2010-03-14T04:26:58+01:00 (7 years ago)
Author:
thepeople
Message:

umurmur: update to 0.2.2, from #6829

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/umurmur/Makefile

    r19897 r20192  
    88 
    99PKG_NAME:=umurmur 
    10 PKG_VERSION:=0.2.1 
    11 PKG_RELEASE:=2 
     10PKG_VERSION:=0.2.2 
     11PKG_RELEASE:=1 
    1212 
    1313PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1414PKG_SOURCE_URL:=http://umurmur.googlecode.com/files/ 
    15 PKG_MD5SUM:=e3471fb925dadc60e3b307efe2a1cc80 
     15PKG_MD5SUM:=a841cf38de7fbc8bdacafbd481561da7 
    1616 
     17PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) 
    1718 
    1819include $(INCLUDE_DIR)/package.mk 
     
    3536  TITLE+= (with OpenSSL support) 
    3637  DEPENDS+= +libopenssl 
     38  VARIANT:=openssl 
    3739endef 
    3840 
     
    4648  TITLE+= (with PolarSSL support) 
    4749  DEPENDS+= +libpolarssl 
     50  VARIANT:=polarssl 
    4851endef 
    4952 
     
    5457 
    5558define Build/Compile 
     59        CC="$(TARGET_CC)" \ 
     60        CFLAGS="$(TARGET_CFLAGS)" \ 
     61        LDFLAGS="$(TARGET_LDFLAGS)" \ 
     62        $(MAKE) -C $(PKG_BUILD_DIR)/src all 
    5663endef 
    5764 
    58 define Build/Template 
    59  
    60 $(STAMP_BUILT)-$(2): $(STAMP_PREPARED) 
    61         -$(MAKE) -C $(PKG_BUILD_DIR)/src clean 
    62         CC="$(TARGET_CC)" \ 
    63         CFLAGS="$(3) -DWRT_TARGET -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \ 
    64         LDFLAGS="$(4) $(TARGET_LDFLAGS)" \ 
    65         $(MAKE) -C $(PKG_BUILD_DIR)/src all 
    66         ( cd $(PKG_BUILD_DIR)/src; mv -f umurmurd umurmurd-$(2)) 
    67         touch $$@ 
    68  
    69 $(STAMP_BUILT): $(STAMP_BUILT)-$(2) 
    70  
    71 define Package/$(1)/conffiles 
     65define Package/umurmur-openssl/conffiles 
    7266/etc/umurmur.conf 
    7367endef 
    7468 
    75 define Package/$(1)/install 
    76         $(INSTALL_DIR) $$(1)/usr/bin 
    77         $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/umurmurd-$(2) $$(1)/usr/bin/umurmurd 
    78         $(INSTALL_DIR) $$(1)/etc 
    79         $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $$(1)/etc/ 
    80         $(INSTALL_DIR) $$(1)/etc/init.d 
    81         $(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/files/umurmur.init $$(1)/etc/init.d/umurmur 
    82         $(INSTALL_DIR) $$(1)/etc/umurmur 
    83 endef 
     69Package/umurmur-polarssl/conffiles = $(Package/umurmur-openssl/conffiles) 
     70 
     71define Package/umurmur-openssl/install 
     72        $(INSTALL_DIR) $(1)/usr/bin 
     73        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/umurmurd $(1)/usr/bin/ 
     74        $(INSTALL_DIR) $(1)/etc 
     75        $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $(1)/etc/ 
     76        $(INSTALL_DIR) $(1)/etc/init.d 
     77        $(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/files/umurmur.init $(1)/etc/init.d/umurmur 
     78        $(INSTALL_DIR) $(1)/etc/umurmur 
    8479endef 
    8580 
    86 ifneq ($(SDK)$(CONFIG_PACKAGE_umurmur-openssl),) 
    87   define Build/with-openssl 
    88     $(call Build/Template,umurmur-openssl,openssl,,-lcrypto -lssl) 
    89   endef 
     81Package/umurmur-polarssl/install = $(Package/umurmur-openssl/install) 
     82 
     83ifeq ($(BUILD_VARIANT),openssl) 
     84  TARGET_CFLAGS += -DWRT_TARGET -I$(STAGING_DIR)/usr/include 
     85  TARGET_LDFLAGS += -lcrypto -lssl 
    9086endif 
    91 $(eval $(Build/with-openssl)) 
    9287 
    93 ifneq ($(SDK)$(CONFIG_PACKAGE_umurmur-polarssl),) 
    94   define Build/with-polarssl 
    95     $(call Build/Template,umurmur-polarssl,polarssl,-DUSE_POLARSSL,-lpolarssl) 
    96   endef 
     88ifeq ($(BUILD_VARIANT),polarssl) 
     89  TARGET_CFLAGS += -DUSE_POLARSSL -DWRT_TARGET -I$(STAGING_DIR)/usr/include 
     90  TARGET_LDFLAGS += -lpolarssl 
    9791endif 
    98 $(eval $(Build/with-polarssl)) 
    99  
    10092 
    10193$(eval $(call BuildPackage,umurmur-openssl)) 
Note: See TracChangeset for help on using the changeset viewer.