mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 21:26:36 +00:00
package/libnetconf2: bump to version 1.1.3
Other changes: - Remove patch (already in upstream version) Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> Signed-off-by: Heiko Thiery <heiko.thiery@kontron.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
dcbe99116d
commit
9f4f5a5434
@ -1,65 +0,0 @@
|
|||||||
From 153fe40bd60499677e825e66501e8601536e0323 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rosen Penev <rosenp@gmail.com>
|
|
||||||
Date: Mon, 15 Jul 2019 18:15:28 -0700
|
|
||||||
Subject: [PATCH] Add support for musl libc
|
|
||||||
|
|
||||||
musl does not support pthread_rwlockattr_setkind_np. Don't use it if it is
|
|
||||||
not available.
|
|
||||||
|
|
||||||
Patch comes from upstream commit:
|
|
||||||
https://github.com/CESNET/libnetconf2/commit/153fe40bd60499677e825e66501e8601536e0323
|
|
||||||
|
|
||||||
Signed-of-by: Heiko Thiery <heiko.thiery@kontron.com>
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 1 +
|
|
||||||
src/config.h.in | 3 +++
|
|
||||||
src/session_server.c | 2 ++
|
|
||||||
3 files changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 624b8c8..c05cd03 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -176,6 +176,7 @@ target_link_libraries(netconf2 ${CMAKE_THREAD_LIBS_INIT})
|
|
||||||
set(CMAKE_REQUIRED_LIBRARIES pthread)
|
|
||||||
check_include_file(stdatomic.h HAVE_STDATOMIC)
|
|
||||||
check_function_exists(pthread_mutex_timedlock HAVE_PTHREAD_MUTEX_TIMEDLOCK)
|
|
||||||
+check_function_exists(pthread_rwlockattr_setkind_np HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP)
|
|
||||||
|
|
||||||
# dependencies - openssl
|
|
||||||
if(ENABLE_TLS OR ENABLE_DNSSEC OR ENABLE_SSH)
|
|
||||||
diff --git a/src/config.h.in b/src/config.h.in
|
|
||||||
index 96d33c5..30dd8a3 100644
|
|
||||||
--- a/src/config.h.in
|
|
||||||
+++ b/src/config.h.in
|
|
||||||
@@ -73,4 +73,7 @@
|
|
||||||
*/
|
|
||||||
#define NC_PS_QUEUE_SIZE @MAX_PSPOLL_THREAD_COUNT@
|
|
||||||
|
|
||||||
+/* Portability feature-check macros. */
|
|
||||||
+#cmakedefine HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP
|
|
||||||
+
|
|
||||||
#endif /* NC_CONFIG_H_ */
|
|
||||||
diff --git a/src/session_server.c b/src/session_server.c
|
|
||||||
index 636b1a2..3b747ed 100644
|
|
||||||
--- a/src/session_server.c
|
|
||||||
+++ b/src/session_server.c
|
|
||||||
@@ -560,6 +560,7 @@ nc_server_init(struct ly_ctx *ctx)
|
|
||||||
errno=0;
|
|
||||||
|
|
||||||
if (pthread_rwlockattr_init(&attr) == 0) {
|
|
||||||
+#if defined(HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP)
|
|
||||||
if (pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP) == 0) {
|
|
||||||
if (pthread_rwlock_init(&server_opts.endpt_lock, &attr) != 0) {
|
|
||||||
ERR("%s: failed to init rwlock(%s).", __FUNCTION__, strerror(errno));
|
|
||||||
@@ -570,6 +571,7 @@ nc_server_init(struct ly_ctx *ctx)
|
|
||||||
} else {
|
|
||||||
ERR("%s: failed set attribute (%s).", __FUNCTION__, strerror(errno));
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
pthread_rwlockattr_destroy(&attr);
|
|
||||||
} else {
|
|
||||||
ERR("%s: failed init attribute (%s).", __FUNCTION__, strerror(errno));
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
|||||||
sha256 760061fb1c1fe87a2a068d5a9e5affcef280044c5940ef344854e9ea7ec26452 libnetconf2-0.12-r2.tar.gz
|
sha256 38e780cdd0135e9c7fe44b5190a1acc8c33cb28aa395c329893b019a57b1f783 libnetconf2-1.1.3.tar.gz
|
||||||
sha256 085122ea91161812dda9cd2f42d8c50ecc3a48cc1a4f15044d86cfc5aa887577 LICENSE
|
sha256 085122ea91161812dda9cd2f42d8c50ecc3a48cc1a4f15044d86cfc5aa887577 LICENSE
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBNETCONF2_VERSION = 0.12-r2
|
LIBNETCONF2_VERSION = 1.1.3
|
||||||
LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION))
|
LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION))
|
||||||
LIBNETCONF2_INSTALL_STAGING = YES
|
LIBNETCONF2_INSTALL_STAGING = YES
|
||||||
LIBNETCONF2_LICENSE = BSD-3-Clause
|
LIBNETCONF2_LICENSE = BSD-3-Clause
|
||||||
|
Loading…
x
Reference in New Issue
Block a user