diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-03-26 21:00:20 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-03-26 21:00:20 +0000 |
| commit | e8c9ebd05233163f9ae8929530faa0f77cf87bc9 (patch) | |
| tree | 6f3c4a273d2efa29eac9e51c462f904a1589b2c6 /package/uci/Makefile | |
| parent | 2c875b2edcc906567e1e97d5bde46719498ad631 (diff) | |
| download | upstream-e8c9ebd05233163f9ae8929530faa0f77cf87bc9.tar.gz upstream-e8c9ebd05233163f9ae8929530faa0f77cf87bc9.tar.bz2 upstream-e8c9ebd05233163f9ae8929530faa0f77cf87bc9.zip | |
uci: update to latest version, uses cmake now
SVN-Revision: 26307
Diffstat (limited to 'package/uci/Makefile')
| -rw-r--r-- | package/uci/Makefile | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/package/uci/Makefile b/package/uci/Makefile index bd46864bc2..ffd37a757b 100644 --- a/package/uci/Makefile +++ b/package/uci/Makefile @@ -7,21 +7,23 @@ include $(TOPDIR)/rules.mk -UCI_VERSION=2011-01-19 +UCI_VERSION=2011-03-26 UCI_RELEASE=1 PKG_NAME:=uci PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) PKG_RELEASE:=1 -PKG_REV:=a5eb996e0f04d911ff61479508bbc3e17b16ff0c +PKG_REV:=0e8c97eef4aa154543c539b13b5e16859cec8a25 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 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:=d5329ee38167608bfe2d6f758d9250d0 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk # set to 1 to enable debugging DEBUG= @@ -53,24 +55,12 @@ define Package/libuci-lua TITLE:=Lua plugin for UCI endef -define Build/Configure -endef +TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include +TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib -UCI_MAKEOPTS = \ - $(TARGET_CONFIGURE_OPTS) \ - COPTS="$(TARGET_CFLAGS)" \ - DEBUG="$(DEBUG)" \ - VERSION="$(UCI_VERSION)" \ - CPPFLAGS="-I$(PKG_BUILD_DIR) $(TARGET_CPPFLAGS)" \ - FPIC="$(FPIC)" \ - OS="Linux" - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS) - $(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS) - $(MAKE) -C $(PKG_BUILD_DIR)/trigger $(UCI_MAKEOPTS) \ - LIBS="$(TARGET_LDFLAGS) -L$(PKG_BUILD_DIR) -luci -llua -lcrypt -lm" -endef +CMAKE_OPTIONS = \ + -DLUAPATH=/usr/lib/lua \ + $(if $(DEBUG),-DUCI_DEBUG=ON) define Package/libuci/install $(INSTALL_DIR) $(1)/lib |