X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cd510bdcabec8a2f9b12ee682ca1208682622a18..a6ff6c1f36b886b61a08ac89996ee15340e6fc64:/package/uci/Makefile?ds=inline diff --git a/package/uci/Makefile b/package/uci/Makefile index 49c3f4261..c0be1a8ab 100644 --- a/package/uci/Makefile +++ b/package/uci/Makefile @@ -1,25 +1,31 @@ # -# 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. # -# $Id$ include $(TOPDIR)/rules.mk -UCI_VERSION=0.7 +UCI_VERSION=2011-07-18 UCI_RELEASE=3 PKG_NAME:=uci PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) PKG_RELEASE:=1 +PKG_REV:=825be5d0cd699919fbad15901c63044f0efffe82 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://downloads.openwrt.org/sources -PKG_MD5SUM:=b8c033e7b08bb39e87ef00bdb779f0ba +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:=3f12c38a4cc6e51f9ae77ae909614762 + +PKG_BUILD_PARALLEL:=0 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk # set to 1 to enable debugging DEBUG= @@ -40,31 +46,16 @@ endef define Package/libuci-lua SECTION=libs CATEGORY=Libraries - DEPENDS:=+libuci +lua + DEPENDS:=+libuci +liblua 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) -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) -endef +CMAKE_OPTIONS = \ + -DLUAPATH=/usr/lib/lua \ + $(if $(DEBUG),-DUCI_DEBUG=ON) define Package/libuci/install $(INSTALL_DIR) $(1)/lib @@ -85,7 +76,7 @@ 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