X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/43770b88170117ae4e2be5b9c10ffe815e1af197..ddc9278d09957a5c6cb27ad0ca696f096476e38a:/package/uci/Makefile?ds=inline diff --git a/package/uci/Makefile b/package/uci/Makefile index b86a4fea1..bd46864bc 100644 --- a/package/uci/Makefile +++ b/package/uci/Makefile @@ -7,16 +7,19 @@ include $(TOPDIR)/rules.mk -UCI_VERSION=0.7 -UCI_RELEASE=5 +UCI_VERSION=2011-01-19 +UCI_RELEASE=1 PKG_NAME:=uci PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) PKG_RELEASE:=1 +PKG_REV:=a5eb996e0f04d911ff61479508bbc3e17b16ff0c PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://downloads.openwrt.org/sources -PKG_MD5SUM:=ed34c5ef606a90da4aba03ce6d22eeb9 +PKG_SOURCE_URL:=git://nbd.name/uci.git +PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_PROTO:=git include $(INCLUDE_DIR)/package.mk @@ -62,11 +65,6 @@ UCI_MAKEOPTS = \ FPIC="$(FPIC)" \ OS="Linux" -# work around a nasty gcc bug -ifneq ($(CONFIG_GCC_VERSION_4_2_4),) - UCI_MAKEOPTS += WOPTS="" -endif - define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS) $(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS) @@ -101,11 +99,10 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_BUILD_DIR)/uci{,_config}.h $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/uci{,_config,map}.h $(1)/usr/include $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/libuci.a $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib endef $(eval $(call BuildPackage,uci))