Revert "package/mac80211: fix atomic64 compat"

[openwrt.git] / package / uci / Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index b88e72c..fadcbcd 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -7,18 +7,25 @@
 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 

-UCI_VERSION=0.7
-UCI_RELEASE=5
+UCI_VERSION=2011-11-14
+UCI_RELEASE=1

 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 PKG_RELEASE:=1
 
 PKG_NAME:=uci
 PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 PKG_RELEASE:=1

+PKG_REV:=7289b2d69aaffa9299b47aaaa0da1e9969ace6c1

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 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
+PKG_MIRROR_MD5SUM:=74b0ab930321c4f85f220ff3852e210a
+
+PKG_BUILD_PARALLEL:=0

 
 include $(INCLUDE_DIR)/package.mk
 
 include $(INCLUDE_DIR)/package.mk

+include $(INCLUDE_DIR)/cmake.mk

 
 # set to 1 to enable debugging
 DEBUG=
 
 # set to 1 to enable debugging
 DEBUG=


@@ -39,31 +46,16 @@ endef
 define Package/libuci-lua
   SECTION=libs
   CATEGORY=Libraries
 define Package/libuci-lua
   SECTION=libs
   CATEGORY=Libraries

-  DEPENDS:=+libuci +lua
+  DEPENDS:=+libuci +liblua

   TITLE:=Lua plugin for UCI
 endef
 
   TITLE:=Lua plugin for UCI
 endef
 

-define Build/Configure
-endef
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib

 
 

-TARGET_CFLAGS += $(FPIC)
-UCI_MAKEOPTS = \
-               $(TARGET_CONFIGURE_OPTS) \
-               COPTS="$(TARGET_CFLAGS)" \
-               DEBUG="$(DEBUG)" \
-               VERSION="$(UCI_VERSION)" \
-               CPPFLAGS="-I$(PKG_BUILD_DIR) $(TARGET_CPPFLAGS)" \
-               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)
-endef
+CMAKE_OPTIONS = \
+       -DLUAPATH=/usr/lib/lua \
+       $(if $(DEBUG),-DUCI_DEBUG=ON)

 
 define Package/libuci/install
        $(INSTALL_DIR) $(1)/lib
 
 define Package/libuci/install
        $(INSTALL_DIR) $(1)/lib


@@ -84,7 +76,7 @@ endef
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
 
 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
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/libuci.a $(1)/usr/lib