toolchain/gcc (linaro): fix extension elimination optimization

[openwrt.git] / package / relayd / Makefile

diff --git a/package/relayd/Makefile b/package/relayd/Makefile
index 35f6a00..1881da9 100644 (file)
--- a/package/relayd/Makefile
+++ b/package/relayd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,30 +8,34 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=relayd
-PKG_VERSION:=2010-10-11
+PKG_VERSION:=2011-02-07
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://nbd.name/relayd.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=caf4d30c669ad8b64ef566b8bab4aec445b90b46
+PKG_SOURCE_VERSION:=aeb49d61c2a737dc9a89e0558388c25208e5e919
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/relayd
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Transparent routing / relay daemon
+  DEPENDS:=+libubox
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)"
-endef
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 
 define Package/relayd/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/relayd $(1)/usr/sbin/relayd
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+       $(INSTALL_DATA) ./files/relay.hotplug $(1)/etc/hotplug.d/iface/30-relay
+       $(INSTALL_DIR) $(1)/lib/network
+       $(INSTALL_DATA) ./files/relay.sh $(1)/lib/network/relay.sh
 endef
 
 $(eval $(call BuildPackage,relayd))