diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-26 21:00:20 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-26 21:00:20 +0000 |
| commit | 933895680f32e9da99a47dbe9443814f0d0461ba (patch) | |
| tree | 06b96a64e88027a66ca954f3328c35058302c2d1 /package/uci/Makefile | |
| parent | cbf4a0f140041ddb1647e4ad742ca946e883a2d6 (diff) | |
uci: update to latest version, uses cmake now
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26307 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 bd46864bc..ffd37a757 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 |