mingw-w64-libmodbus: update to 3.1.4

3 files changed, 16 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d333c3261d61..e6e7f622defa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = mingw-w64-libmodbus
 	pkgdesc = A Modbus library for Linux, Mac OS X, FreeBSD, QNX and Win32 (mingw-w64)
-	pkgver = 3.0.6
+	pkgver = 3.1.4
 	pkgrel = 1
 	url = http://libmodbus.org/
 	arch = any
 	license = LGPL
-	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-configure
 	depends = mingw-w64-crt
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = http://libmodbus.org/releases/libmodbus-3.0.6.tar.gz
-	source = fix-error-code-defs.patch
-	md5sums = c80f88b6ca19cabc4ceffc195ca07771
-	md5sums = 00c6e44c5568c7027d0a76cba83d72c2
+	source = http://libmodbus.org/releases/libmodbus-3.1.4.tar.gz
+	md5sums = b1a8fd3a40d2db4de51fb0cbcb201806
 
 pkgname = mingw-w64-libmodbus
 
diff --git a/PKGBUILD b/PKGBUILD
index 373722de7792..cdc3341ad323 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,41 @@
+# Maintainer: Andrew Sun <adsun701@gmail.com>
 # Contributor: Stas Elensky <stas-at-flexsys-dot-com-dot-ua>
 
 pkgname=mingw-w64-libmodbus
-pkgver=3.0.6
+pkgver=3.1.4
 pkgrel=1
 pkgdesc="A Modbus library for Linux, Mac OS X, FreeBSD, QNX and Win32 (mingw-w64)"
 arch=('any')
 url="http://libmodbus.org/"
 license=('LGPL')
 depends=('mingw-w64-crt')
-makedepends=('mingw-w64-gcc')
+makedepends=('mingw-w64-configure')
 options=(!strip !buildflags staticlibs)
 _pkgfqn="libmodbus-${pkgver}"
-source=(
-  "http://libmodbus.org/releases/libmodbus-$pkgver.tar.gz"
-  'fix-error-code-defs.patch')
-md5sums=(
-  'c80f88b6ca19cabc4ceffc195ca07771'
-  '00c6e44c5568c7027d0a76cba83d72c2'
-  )
+source=("http://libmodbus.org/releases/libmodbus-${pkgver}.tar.gz")
+md5sums=('b1a8fd3a40d2db4de51fb0cbcb201806')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
+prepare() {
+  cd "${srcdir}/${_pkgfqn}"
+  autoreconf -fiv
+}
+
 build() {
   unset CFLAGS
   unset LDFLAGS
+  export ac_cv_func_malloc_0_nonnull=yes
 
   cd "$srcdir/$_pkgfqn"
 
   # skip tests
   sed -i 's/ tests//' Makefile.am
 
-  # fix compilation under mingw-w64
-  patch -p0 -i "$srcdir/fix-error-code-defs.patch"
-
-  autoreconf --install --symlink --force
-
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch}
     pushd build-${_arch}
-    ../configure --prefix=/usr/${_arch} --host=${_arch} --without-documentation
+    ${_arch}-configure --without-documentation ..
     make
     popd
   done
diff --git a/fix-error-code-defs.patch b/fix-error-code-defs.patch
deleted file mode 100644
index a8d0c0771593..000000000000
--- a/fix-error-code-defs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/modbus-rtu-private.h	2013-10-07 00:42:53.000000000 +0300
-+++ src/modbus-rtu-private.h	2013-12-11 18:00:15.166666606 +0200
-@@ -38,7 +38,9 @@
- #define _MODBUS_RTU_CHECKSUM_LENGTH    2
- 
- #if defined(_WIN32)
-+#ifndef ENOTSUP
- #define ENOTSUP WSAEOPNOTSUPP
-+#endif
- 
- /* WIN32: struct containing serial handle and a receive buffer */
- #define PY_BUF_SIZE 512
---- src/modbus-tcp.h	2013-10-07 00:42:53.000000000 +0300
-+++ src/modbus-tcp.h	2013-12-11 18:00:09.863299755 +0200
-@@ -26,11 +26,19 @@
- #if defined(_WIN32) && !defined(__CYGWIN__)
- /* Win32 with MinGW, supplement to <errno.h> */
- #include <winsock2.h>
-+#ifndef ECONNRESET
- #define ECONNRESET   WSAECONNRESET
-+#endif
-+#ifndef ECONNREFUSED
- #define ECONNREFUSED WSAECONNREFUSED
-+#endif
-+#ifndef ETIMEDOUT
- #define ETIMEDOUT    WSAETIMEDOUT
-+#endif
-+#ifndef ENOPROTOOPT
- #define ENOPROTOOPT  WSAENOPROTOOPT
- #endif
-+#endif
- 
- #define MODBUS_TCP_DEFAULT_PORT   502
- #define MODBUS_TCP_SLAVE         0xFF