X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/198aaf22513de9fbd7f55ce3017fc7bf90340a84..2f75fd1fa094e3f9ae270d47b64eaf99d0d0ff94:/package/uci/Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 6bf2a13b6..49c3f4261 100644
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -8,8 +8,8 @@
 
 include $(TOPDIR)/rules.mk
 
-UCI_VERSION=0.4
-UCI_RELEASE=2
+UCI_VERSION=0.7
+UCI_RELEASE=3
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
@@ -17,7 +17,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=503b3faa92bb9f5d780ca96efb7dfd75
+PKG_MD5SUM:=b8c033e7b08bb39e87ef00bdb779f0ba
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -37,13 +37,6 @@ define Package/uci
   TITLE:=Utility for the Unified Configuration Interface (UCI)
 endef
 
-define Package/uci-sh
-  SECTION:=base
-  CATEGORY:=Base system
-  DEPENDS:=@!PACKAGE_uci
-  TITLE:=Old shell/awk implementation of UCI
-endef
-
 define Package/libuci-lua
   SECTION=libs
   CATEGORY=Libraries
@@ -54,6 +47,7 @@ endef
 define Build/Configure
 endef
 
+TARGET_CFLAGS += $(FPIC)
 UCI_MAKEOPTS = \
 		$(TARGET_CONFIGURE_OPTS) \
 		COPTS="$(TARGET_CFLAGS)" \
@@ -62,6 +56,11 @@ UCI_MAKEOPTS = \
 		CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \
 		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)
@@ -81,12 +80,7 @@ define Package/uci/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/
-	$(CP) ./files/uci/* $(1)/
-endef
-
-define Package/uci-sh/install
-	$(INSTALL_DIR) $(1)
-	$(CP) ./files/uci-sh/* $(1)/
+	$(CP) ./files/* $(1)/
 endef
 
 define Build/InstallDev
@@ -94,9 +88,10 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/uci{,_config}.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))
 $(eval $(call BuildPackage,libuci))
 $(eval $(call BuildPackage,libuci-lua))
-$(eval $(call BuildPackage,uci-sh))