libmodbus, bump version (#6522)

This commit is contained in:
Schrijvers Luc
2022-01-09 15:44:01 +01:00
committed by GitHub
parent 48e7afd149
commit f6f3ffefda
2 changed files with 52 additions and 3 deletions

View File

@@ -16,9 +16,10 @@ COPYRIGHT="Stéphane Raimbault
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="https://github.com/stephane/libmodbus/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="fe0c141cd10d58bb848643f00f2d4b4005214f93312d7b66ac805fd369876651"
CHECKSUM_SHA256="af8ade1eec30fe3dc6ddf8f711b37f9a931532287f39a40f54e6f475402df389"
PATCHES="libmodbus-$portVersion.patchset"
ARCHITECTURES="all"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="5.1.0"
@@ -56,7 +57,7 @@ BUILD_PREREQUIRES="
BUILD()
{
autogen.sh
LIBS=-lnetwork runConfigure ./configure
runConfigure ./configure
make $jobArgs
}
@@ -75,5 +76,6 @@ INSTALL()
TEST()
{
chmod +x tests/unit-tests.sh
make check
}

View File

@@ -0,0 +1,47 @@
From babde2e445feda1299589a087eab0f156ab6b9cd Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 9 Jan 2022 08:23:30 +0000
Subject: Add check for libnetwork
diff --git a/configure.ac b/configure.ac
index b65d1ae..a90a75e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,9 @@ AC_LIBMODBUS_CHECK_BUILD_DOC
# workaround that problem and Cygwin doesn't define MSG_DONTWAIT.
AC_CHECK_DECLS([__CYGWIN__])
+# Check for network function in libnetwork for Haiku
+AC_SEARCH_LIBS(accept, network socket)
+
# Checks for library functions.
AC_CHECK_FUNCS([accept4 getaddrinfo gettimeofday inet_ntoa select socket strerror strlcpy])
--
2.30.2
From 73297e5f0de6ccc4239a18d8ed22f0a4ff3d0b5a Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 9 Jan 2022 08:25:41 +0000
Subject: Haiku doesn't supply killall
diff --git a/tests/unit-tests.sh b/tests/unit-tests.sh
old mode 100755
new mode 100644
index 37f716f..a752bf6
--- a/tests/unit-tests.sh
+++ b/tests/unit-tests.sh
@@ -14,6 +14,6 @@ echo "Starting client"
./unit-test-client > $client_log 2>&1
rc=$?
-killall unit-test-server
+kill unit-test-server
exit $rc
--
2.30.2