lede-packages-rs

commit 1696390af8da8b49eaa3aacb69a5bf5c350e5460
parent 3ed70bb7724507afdffb3d4ea8be7091510bd976
Author: Jo-Philipp Wich <jow@openwrt.org>
Date:   Sat, 27 Jun 2015 11:19:07 +0200

Merge pull request #1483 from jow-/open-plc-utils-musl-compat

open-plc-utils: fix musl and fortify source compatibility
Diffstat:
M
utils/open-plc-utils/Makefile
 | 
4
++--
A
utils/open-plc-utils/patches/100-musl-compat.patch
 | 
33
+++++++++++++++++++++++++++++++++

2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/utils/open-plc-utils/Makefile b/utils/open-plc-utils/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2014 OpenWrt.org
+# Copyright (C) 2013-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=open-plc-utils
-PKG_VERSION:=2015-02-23
+PKG_VERSION:=2015-06-26
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
diff --git a/utils/open-plc-utils/patches/100-musl-compat.patch b/utils/open-plc-utils/patches/100-musl-compat.patch
@@ -0,0 +1,33 @@
+--- a/ether/readpacket.c
++++ b/ether/readpacket.c
+@@ -70,6 +70,10 @@
+ #include <memory.h>
+ #include <errno.h>
+ 
++#if defined (__linux__)
++#include <poll.h>
++#endif
++
+ #include "../ether/channel.h"
+ #include "../tools/memory.h"
+ #include "../tools/error.h"
+@@ -95,8 +99,6 @@ ssize_t readpacket (struct channel const
+ 
+ #elif defined (__linux__)
+ 
+-#include <sys/poll.h>
+-
+ 	struct pollfd pollfd =
+ 	{
+ 		channel->fd,
+--- a/serial/serial.c
++++ b/serial/serial.c
+@@ -69,6 +69,8 @@
+ 
+ #if defined (WIN32)
+ #include <Windows.h>
++#else
++#include <sys/select.h>
+ #endif
+ 
+ /*====================================================================*