Merge pull request #1594 from tru7/knxd

knxd: new version, force gcc instead of g++, simplify package structure

net/knxd/Makefile

@@ -11,12 +11,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=knxd
-PKG_VERSION=2015-06-27-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=2
+PKG_VERSION=2015-07-19-$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/knxd/knxd.git
-PKG_SOURCE_VERSION:=50e7f6e6bfa13c2b6140b0f76aaa70234bf44b1d
+PKG_SOURCE_VERSION:=be1fcfe85cc1dfcc41f791cd9a45c57fe18da6a0
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -38,7 +38,7 @@ define Package/knxd
   SECTION:=net
   CATEGORY:=Network
   TITLE:=EIB KNX daemon
-  DEPENDS:=+pthsem +libusb-1.0 +libstdcpp
+  DEPENDS:=+pthsem +libusb-1.0
 endef
 
 define Package/knxd/description
@@ -49,56 +49,39 @@ define Package/knxd/conffiles
 /etc/config/knxd
 endef
 
-define Package/libeibclient
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for EIB clients
-  DEPENDS:=+pthsem
-endef
-
-define Package/libeibclient/description
-EIB KNX client library
-endef
-
 define Package/knxd-tools
   SECTION:=net
   CATEGORY:=Network
   TITLE:=EIB KNX Utils
-  DEPENDS:=+libeibclient
 endef
 
 define Package/knxd-tools/description
 EIB KNX Tools
 endef
 
+TARGET_CXXFLAGS+= -fno-rtti
+TARGET_CXX=$(TARGET_CC)
+
 CONFIGURE_ARGS+= \
 	--disable-ft12 \
 	--enable-eibnetip \
 	--enable-eibnetiptunnel \
 	--enable-eibnetipserver \
 	--enable-usb \
-	--enable-tpuart \
 	--enable-tpuarts \
-	--disable-pei16 \
 	--disable-pei16s \
 	--enable-groupcache \
 	--without-pth-test \
+	--disable-systemd \
 	--without-libstdc
 
 EXTRA_LDFLAGS+= \
        -fno-builtin -largp
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/eib*.h $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libeibclient.{a,so*} $(1)/usr/lib/
-endef
-
 define Package/knxd/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(RM) $(1)/usr/bin/knxtool
 
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/knxd.init $(1)/etc/init.d/knxd
@@ -107,46 +90,14 @@ define Package/knxd/install
 	$(INSTALL_DATA) ./files/knxd.config $(1)/etc/config/knxd
 endef
 
-define Package/libeibclient/install
+define Package/knxd-tools/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libeibclient.so* $(1)/usr/lib/
-endef
-
-define Package/knxd-tools/install
 	$(INSTALL_DIR) $(1)/usr/bin
-
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/knxtool $(1)/usr/bin/
-	ln -sf knxtool $(1)/usr/bin/knxread
-	ln -sf knxtool $(1)/usr/bin/knxreadtemp
-	ln -sf knxtool $(1)/usr/bin/knxwrite
-	ln -sf knxtool $(1)/usr/bin/knxlog
-	ln -sf knxtool $(1)/usr/bin/knxon
-	ln -sf knxtool $(1)/usr/bin/knxoff
-	ln -sf knxtool $(1)/usr/bin/knxif
-	ln -sf knxtool $(1)/usr/bin/knxswrite
-	ln -sf knxtool $(1)/usr/bin/knxbool
-	ln -sf knxtool $(1)/usr/bin/knxdimup
-
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/busmonitor1 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/busmonitor2 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/busmonitor3 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/eibread-cgi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/eibwrite-cgi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/vbusmonitor1 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/vbusmonitor2 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/vbusmonitor3 $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupwrite $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupswrite $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/grouplisten $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupread $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupresponse $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupreadresponse $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketlisten $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketread $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketwrite $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketswrite $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/knxtool $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/knxd/eibwrite-cgi $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/knxd/eibread-cgi $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,knxd))
-$(eval $(call BuildPackage,libeibclient))
 $(eval $(call BuildPackage,knxd-tools))

net/knxd/patches/0100-musl-compat

@@ -1,10 +0,0 @@
---- a/src/examples/common.h	2015-06-27 15:20:15.266563893 +0200
-+++ b/src/examples/common.h	2015-06-27 15:23:09.406457392 +0200
-@@ -20,6 +20,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <sys/select.h>
- #include "eibclient.h"
- 
- /** unsigned char*/