mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 00:20:38 -09:00
package/libnpth: bump to version 1.8
For the changelog, see: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=log;h=npth-1.8 Remove merged patches. Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Julien: add link to change log] Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Francois Perrad
committed by
Julien Olivain
Julien Olivain
parent
6b2e3b2ce5
commit
d21fdce771
@@ -1,37 +0,0 @@
|
||||
From 417abd56fd7bf45cd4948414050615cb1ad59134 Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Fri, 1 Mar 2024 13:53:52 +0900
|
||||
Subject: [PATCH] Fix INSERT_EXPOSE_RWLOCK_API for musl C library.
|
||||
|
||||
* configure.ac: Add a case for musl system.
|
||||
|
||||
--
|
||||
|
||||
GnuPG-bug-id: 5664
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
|
||||
Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=417abd56fd7bf45cd4948414050615cb1ad59134
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
configure.ac | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c1091b1..576a26e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -381,7 +381,10 @@ fi
|
||||
AC_SUBST(INSERT_NO_RWLOCK)
|
||||
|
||||
case "${host}" in
|
||||
- *-*-linux*|*-*-gnu*)
|
||||
+ *-*-linux-musl*)
|
||||
+ INSERT_EXPOSE_RWLOCK_API="1"
|
||||
+ ;;
|
||||
+ *-*-linux-gnu*|*-*-gnu*)
|
||||
INSERT_EXPOSE_RWLOCK_API="defined(__USE_UNIX98) || defined(__USE_XOPEN2K)"
|
||||
;;
|
||||
*)
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
From 01f03a91c9bd63910995aeef412beb3ca6dc9a67 Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Tue, 7 May 2024 13:45:47 +0900
|
||||
Subject: [PATCH] Return a run-time error if npth_rwlock_timedrdlock is not
|
||||
supported.
|
||||
|
||||
* src/npth.c (npth_rwlock_timedrdlock): Return ENOSYS if not
|
||||
supported.
|
||||
(npth_rwlock_timedwrlock): Use HAVE_PTHREAD_RWLOCK_TRYWRLOCK.
|
||||
|
||||
--
|
||||
|
||||
GnuPG-bug-id: 7109
|
||||
Fixed-commit: 363c370bd35dd0bb4e5636b2d4f06ea88c658794
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
|
||||
Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=01f03a91c9bd63910995aeef412beb3ca6dc9a67
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/npth.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/npth.c b/src/npth.c
|
||||
index c0ff8da..f02540c 100644
|
||||
--- a/src/npth.c
|
||||
+++ b/src/npth.c
|
||||
@@ -488,9 +488,11 @@ npth_rwlock_timedrdlock (npth_rwlock_t *rwlock, const struct timespec *abstime)
|
||||
ENTER();
|
||||
#if HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK
|
||||
err = pthread_rwlock_timedrdlock (rwlock, abstime);
|
||||
-#else
|
||||
+#elif HAVE_PTHREAD_RWLOCK_TRYRDLOCK
|
||||
err = busy_wait_for ((trylock_func_t) pthread_rwlock_tryrdlock, rwlock,
|
||||
abstime);
|
||||
+#else
|
||||
+ err = ENOSYS;
|
||||
#endif
|
||||
LEAVE();
|
||||
return err;
|
||||
@@ -533,7 +535,7 @@ npth_rwlock_timedwrlock (npth_rwlock_t *rwlock, const struct timespec *abstime)
|
||||
ENTER();
|
||||
#if HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK
|
||||
err = pthread_rwlock_timedwrlock (rwlock, abstime);
|
||||
-#elif HAVE_PTHREAD_RWLOCK_TRYRDLOCK
|
||||
+#elif HAVE_PTHREAD_RWLOCK_TRYWRLOCK
|
||||
err = busy_wait_for ((trylock_func_t) pthread_rwlock_trywrlock, rwlock,
|
||||
abstime);
|
||||
#else
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 75c68399ef3bbb5d024f2a60474a7214fa479016 Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Mon, 13 May 2024 11:13:23 +0900
|
||||
Subject: [PATCH] Fix previous commit.
|
||||
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
|
||||
Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=75c68399ef3bbb5d024f2a60474a7214fa479016
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/npth.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/src/npth.c b/src/npth.c
|
||||
index f02540c..8dced17 100644
|
||||
--- a/src/npth.c
|
||||
+++ b/src/npth.c
|
||||
@@ -178,6 +178,18 @@ static int initialized_or_any_threads;
|
||||
typedef int (*trylock_func_t) (void *);
|
||||
|
||||
#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
|
||||
+#define REQUIRE_THE_BUSY_WAIT_FOR_IMPLEMENTATION 1
|
||||
+#endif
|
||||
+
|
||||
+#if !HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK && HAVE_PTHREAD_RWLOCK_TRYRDLOCK
|
||||
+#define REQUIRE_THE_BUSY_WAIT_FOR_IMPLEMENTATION 1
|
||||
+#endif
|
||||
+
|
||||
+#if !HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK && HAVE_PTHREAD_RWLOCK_TRYWRLOCK
|
||||
+#define REQUIRE_THE_BUSY_WAIT_FOR_IMPLEMENTATION 1
|
||||
+#endif
|
||||
+
|
||||
+#if REQUIRE_THE_BUSY_WAIT_FOR_IMPLEMENTATION
|
||||
static int
|
||||
busy_wait_for (trylock_func_t trylock, void *lock,
|
||||
const struct timespec *abstime)
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# From https://www.gnupg.org/download/integrity_check.html
|
||||
sha1 a9f7adc1b1f6707071d29bfb3338c28b995ca1ce npth-1.7.tar.bz2
|
||||
sha256 8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05 npth-1.7.tar.bz2
|
||||
sha1 6f60ce8540453e120d715f269d0c7cfd9e0b0d24 npth-1.8.tar.bz2
|
||||
sha256 8bd24b4f23a3065d6e5b26e98aba9ce783ea4fd781069c1b35d149694e90ca3e npth-1.8.tar.bz2
|
||||
|
||||
# Hash for license file:
|
||||
sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING.LIB
|
||||
|
||||
@@ -4,14 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBNPTH_VERSION = 1.7
|
||||
LIBNPTH_VERSION = 1.8
|
||||
LIBNPTH_SOURCE = npth-$(LIBNPTH_VERSION).tar.bz2
|
||||
LIBNPTH_SITE = https://www.gnupg.org/ftp/gcrypt/npth
|
||||
LIBNPTH_LICENSE = LGPL-2.0+
|
||||
LIBNPTH_LICENSE_FILES = COPYING.LIB
|
||||
LIBNPTH_INSTALL_STAGING = YES
|
||||
# 0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch
|
||||
LIBNPTH_AUTORECONF = YES
|
||||
LIBNPTH_CONF_OPTS = --disable-tests
|
||||
HOST_LIBNPTH_CONF_OPTS = --disable-tests
|
||||
|
||||
|
||||
Reference in New Issue
Block a user