mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
npth: update 1.6 -> 1.7
Drop 0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch (upstream resolved the issue) npth-config is no longer installed. (From OE-Core rev: 21cd99cd96fd8a06d007fe00570ebac98fedbdad) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
8d2b914b50
commit
9ac975fc8a
-43
@@ -1,43 +0,0 @@
|
|||||||
From e43524868bb4901703d63876f9d49f73ca75b3ab Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Wed, 12 May 2021 20:27:52 -0700
|
|
||||||
Subject: [PATCH] Revert "Fix problem with regression tests on recent glibc."
|
|
||||||
|
|
||||||
This reverts commit 3a9d32eb59194b989656548755066ccd9feb36ac.
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
configure.ac | 8 +++-----
|
|
||||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 8a9373c..8cda28d 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -284,11 +284,9 @@ AC_TYPE_SSIZE_T
|
|
||||||
#
|
|
||||||
# Checks for libraries and functions.
|
|
||||||
#
|
|
||||||
-# We test for pthread_detach because glibc 2.22 includes
|
|
||||||
-# pthread_create but not pthread_detach.
|
|
||||||
if test "$have_w32_system" = no; then
|
|
||||||
- AC_SEARCH_LIBS([pthread_detach],[pthread])
|
|
||||||
- case "x$ac_cv_search_pthread_detach" in
|
|
||||||
+ AC_SEARCH_LIBS([pthread_create],[pthread])
|
|
||||||
+ case "x$ac_cv_search_pthread_create" in
|
|
||||||
xno)
|
|
||||||
have_pthread=no
|
|
||||||
;;
|
|
||||||
@@ -297,7 +295,7 @@ if test "$have_w32_system" = no; then
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
have_pthread=yes
|
|
||||||
- config_libs="$config_libs $ac_cv_search_pthread_detach"
|
|
||||||
+ config_libs="$config_libs $ac_cv_search_pthread_create"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
if test "$have_pthread" != no; then
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
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.
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=417abd56fd7bf45cd4948414050615cb1ad59134]
|
||||||
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
--
|
||||||
|
|
||||||
|
GnuPG-bug-id: 5664
|
||||||
|
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||||
|
---
|
||||||
|
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,29 +1,35 @@
|
|||||||
Added npth pkgconfig file
|
From ff19a9648f1c7d93087e2c33ca64bb881d53ea5a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Saul Wold <sgw@linux.intel.com>
|
||||||
|
Date: Mon, 10 Nov 2014 13:59:03 -0800
|
||||||
|
Subject: [PATCH] Added npth pkgconfig file
|
||||||
|
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
|
|
||||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||||
|
---
|
||||||
|
configure.ac | 1 +
|
||||||
|
src/Makefile.am | 4 +++-
|
||||||
|
src/npth.pc.in | 10 ++++++++++
|
||||||
|
3 files changed, 14 insertions(+), 1 deletion(-)
|
||||||
|
create mode 100644 src/npth.pc.in
|
||||||
|
|
||||||
Index: npth-1.1/src/npth.pc.in
|
diff --git a/configure.ac b/configure.ac
|
||||||
===================================================================
|
index 10f3629..65b76a1 100644
|
||||||
--- /dev/null
|
--- a/configure.ac
|
||||||
+++ npth-1.1/src/npth.pc.in
|
+++ b/configure.ac
|
||||||
@@ -0,0 +1,10 @@
|
@@ -476,6 +476,7 @@ src/Makefile
|
||||||
+prefix=@prefix@
|
w32/Makefile
|
||||||
+exec_prefix=@exec_prefix@
|
tests/Makefile])
|
||||||
+libdir=@libdir@
|
AC_CONFIG_FILES(npth-config, chmod +x npth-config)
|
||||||
+includedir=@includedir@
|
+AC_CONFIG_FILES([src/npth.pc])
|
||||||
+
|
AC_OUTPUT
|
||||||
+Name: npth
|
|
||||||
+Description: a new portable posix threading library
|
echo "
|
||||||
+Version: @VERSION@
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||||
+Libs: -L${libdir} -lnpth -lpthread
|
index 7070118..6f01c64 100644
|
||||||
+Cflags: -I${includedir}
|
--- a/src/Makefile.am
|
||||||
Index: npth-1.1/src/Makefile.am
|
+++ b/src/Makefile.am
|
||||||
===================================================================
|
@@ -17,8 +17,10 @@
|
||||||
--- npth-1.1.orig/src/Makefile.am
|
|
||||||
+++ npth-1.1/src/Makefile.am
|
|
||||||
@@ -27,8 +27,10 @@
|
|
||||||
# License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
# License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
@@ -35,15 +41,19 @@ Index: npth-1.1/src/Makefile.am
|
|||||||
# versioninfo.rc.in
|
# versioninfo.rc.in
|
||||||
nodist_include_HEADERS = npth.h
|
nodist_include_HEADERS = npth.h
|
||||||
|
|
||||||
Index: npth-1.1/configure.ac
|
diff --git a/src/npth.pc.in b/src/npth.pc.in
|
||||||
===================================================================
|
new file mode 100644
|
||||||
--- npth-1.1.orig/configure.ac
|
index 0000000..db091e8
|
||||||
+++ npth-1.1/configure.ac
|
--- /dev/null
|
||||||
@@ -337,6 +337,7 @@ src/Makefile
|
+++ b/src/npth.pc.in
|
||||||
w32/Makefile
|
@@ -0,0 +1,10 @@
|
||||||
tests/Makefile])
|
+prefix=@prefix@
|
||||||
AC_CONFIG_FILES(npth-config, chmod +x npth-config)
|
+exec_prefix=@exec_prefix@
|
||||||
+AC_CONFIG_FILES([src/npth.pc])
|
+libdir=@libdir@
|
||||||
AC_OUTPUT
|
+includedir=@includedir@
|
||||||
|
+
|
||||||
echo "
|
+Name: npth
|
||||||
|
+Description: a new portable posix threading library
|
||||||
|
+Version: @VERSION@
|
||||||
|
+Libs: -L${libdir} -lnpth -lpthread
|
||||||
|
+Cflags: -I${includedir}
|
||||||
|
|||||||
@@ -9,18 +9,14 @@ LIC_FILES_CHKSUM = "\
|
|||||||
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
|
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
|
||||||
SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \
|
SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \
|
||||||
file://pkgconfig.patch \
|
file://pkgconfig.patch \
|
||||||
file://0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch \
|
file://musl-fix.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "375d1a15ad969f32d25f1a7630929854"
|
SRC_URI[sha256sum] = "8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05"
|
||||||
SRC_URI[sha256sum] = "1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1"
|
|
||||||
|
|
||||||
BINCONFIG = "${bindir}/npth-config"
|
|
||||||
|
|
||||||
inherit autotools binconfig-disabled multilib_header
|
inherit autotools binconfig-disabled multilib_header
|
||||||
|
|
||||||
FILES:${PN} = "${libdir}/libnpth.so.*"
|
FILES:${PN} = "${libdir}/libnpth.so.*"
|
||||||
FILES:${PN}-dev += "${bindir}/npth-config"
|
|
||||||
|
|
||||||
do_install:append() {
|
do_install:append() {
|
||||||
oe_multilib_header npth.h
|
oe_multilib_header npth.h
|
||||||
Reference in New Issue
Block a user