summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch43
-rw-r--r--meta/recipes-support/npth/npth/musl-fix.patch37
-rw-r--r--meta/recipes-support/npth/npth/pkgconfig.patch74
-rw-r--r--meta/recipes-support/npth/npth_1.7.bb (renamed from meta/recipes-support/npth/npth_1.6.bb)10
4 files changed, 82 insertions, 82 deletions
diff --git a/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch b/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch
deleted file mode 100644
index 47c426b4a5..0000000000
--- a/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From e43524868bb4901703d63876f9d49f73ca75b3ab Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 12 May 2021 20:27:52 -0700
4Subject: [PATCH] Revert "Fix problem with regression tests on recent glibc."
5
6This reverts commit 3a9d32eb59194b989656548755066ccd9feb36ac.
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 configure.ac | 8 +++-----
12 1 file changed, 3 insertions(+), 5 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 8a9373c..8cda28d 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -284,11 +284,9 @@ AC_TYPE_SSIZE_T
19 #
20 # Checks for libraries and functions.
21 #
22-# We test for pthread_detach because glibc 2.22 includes
23-# pthread_create but not pthread_detach.
24 if test "$have_w32_system" = no; then
25- AC_SEARCH_LIBS([pthread_detach],[pthread])
26- case "x$ac_cv_search_pthread_detach" in
27+ AC_SEARCH_LIBS([pthread_create],[pthread])
28+ case "x$ac_cv_search_pthread_create" in
29 xno)
30 have_pthread=no
31 ;;
32@@ -297,7 +295,7 @@ if test "$have_w32_system" = no; then
33 ;;
34 *)
35 have_pthread=yes
36- config_libs="$config_libs $ac_cv_search_pthread_detach"
37+ config_libs="$config_libs $ac_cv_search_pthread_create"
38 ;;
39 esac
40 if test "$have_pthread" != no; then
41--
422.31.1
43
diff --git a/meta/recipes-support/npth/npth/musl-fix.patch b/meta/recipes-support/npth/npth/musl-fix.patch
new file mode 100644
index 0000000000..fabe78b14c
--- /dev/null
+++ b/meta/recipes-support/npth/npth/musl-fix.patch
@@ -0,0 +1,37 @@
1From 417abd56fd7bf45cd4948414050615cb1ad59134 Mon Sep 17 00:00:00 2001
2From: NIIBE Yutaka <gniibe@fsij.org>
3Date: Fri, 1 Mar 2024 13:53:52 +0900
4Subject: [PATCH] Fix INSERT_EXPOSE_RWLOCK_API for musl C library.
5
6* configure.ac: Add a case for musl system.
7
8Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=417abd56fd7bf45cd4948414050615cb1ad59134]
9Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10--
11
12GnuPG-bug-id: 5664
13Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
14---
15 configure.ac | 5 ++++-
16 1 file changed, 4 insertions(+), 1 deletion(-)
17
18diff --git a/configure.ac b/configure.ac
19index c1091b1..576a26e 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -381,7 +381,10 @@ fi
23 AC_SUBST(INSERT_NO_RWLOCK)
24
25 case "${host}" in
26- *-*-linux*|*-*-gnu*)
27+ *-*-linux-musl*)
28+ INSERT_EXPOSE_RWLOCK_API="1"
29+ ;;
30+ *-*-linux-gnu*|*-*-gnu*)
31 INSERT_EXPOSE_RWLOCK_API="defined(__USE_UNIX98) || defined(__USE_XOPEN2K)"
32 ;;
33 *)
34--
352.30.2
36
37
diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch
index b6a12e7309..e736921b43 100644
--- a/meta/recipes-support/npth/npth/pkgconfig.patch
+++ b/meta/recipes-support/npth/npth/pkgconfig.patch
@@ -1,13 +1,51 @@
1Added npth pkgconfig file 1From ff19a9648f1c7d93087e2c33ca64bb881d53ea5a Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Mon, 10 Nov 2014 13:59:03 -0800
4Subject: [PATCH] Added npth pkgconfig file
2 5
3Upstream-Status: Pending 6Upstream-Status: Pending
4 7
5Signed-off-by: Saul Wold <sgw@linux.intel.com> 8Signed-off-by: Saul Wold <sgw@linux.intel.com>
9---
10 configure.ac | 1 +
11 src/Makefile.am | 4 +++-
12 src/npth.pc.in | 10 ++++++++++
13 3 files changed, 14 insertions(+), 1 deletion(-)
14 create mode 100644 src/npth.pc.in
6 15
7Index: npth-1.1/src/npth.pc.in 16diff --git a/configure.ac b/configure.ac
8=================================================================== 17index 10f3629..65b76a1 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -476,6 +476,7 @@ src/Makefile
21 w32/Makefile
22 tests/Makefile])
23 AC_CONFIG_FILES(npth-config, chmod +x npth-config)
24+AC_CONFIG_FILES([src/npth.pc])
25 AC_OUTPUT
26
27 echo "
28diff --git a/src/Makefile.am b/src/Makefile.am
29index 7070118..6f01c64 100644
30--- a/src/Makefile.am
31+++ b/src/Makefile.am
32@@ -17,8 +17,10 @@
33 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
34
35 ## Process this file with automake to produce Makefile.in
36+pkgconfigdir = $(libdir)/pkgconfig
37+pkgconfig_DATA = npth.pc
38
39-EXTRA_DIST = libnpth.vers
40+EXTRA_DIST = libnpth.vers npth.pc
41 # versioninfo.rc.in
42 nodist_include_HEADERS = npth.h
43
44diff --git a/src/npth.pc.in b/src/npth.pc.in
45new file mode 100644
46index 0000000..db091e8
9--- /dev/null 47--- /dev/null
10+++ npth-1.1/src/npth.pc.in 48+++ b/src/npth.pc.in
11@@ -0,0 +1,10 @@ 49@@ -0,0 +1,10 @@
12+prefix=@prefix@ 50+prefix=@prefix@
13+exec_prefix=@exec_prefix@ 51+exec_prefix=@exec_prefix@
@@ -19,31 +57,3 @@ Index: npth-1.1/src/npth.pc.in
19+Version: @VERSION@ 57+Version: @VERSION@
20+Libs: -L${libdir} -lnpth -lpthread 58+Libs: -L${libdir} -lnpth -lpthread
21+Cflags: -I${includedir} 59+Cflags: -I${includedir}
22Index: npth-1.1/src/Makefile.am
23===================================================================
24--- npth-1.1.orig/src/Makefile.am
25+++ npth-1.1/src/Makefile.am
26@@ -27,8 +27,10 @@
27 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
28
29 ## Process this file with automake to produce Makefile.in
30+pkgconfigdir = $(libdir)/pkgconfig
31+pkgconfig_DATA = npth.pc
32
33-EXTRA_DIST = libnpth.vers
34+EXTRA_DIST = libnpth.vers npth.pc
35 # versioninfo.rc.in
36 nodist_include_HEADERS = npth.h
37
38Index: npth-1.1/configure.ac
39===================================================================
40--- npth-1.1.orig/configure.ac
41+++ npth-1.1/configure.ac
42@@ -337,6 +337,7 @@ src/Makefile
43 w32/Makefile
44 tests/Makefile])
45 AC_CONFIG_FILES(npth-config, chmod +x npth-config)
46+AC_CONFIG_FILES([src/npth.pc])
47 AC_OUTPUT
48
49 echo "
diff --git a/meta/recipes-support/npth/npth_1.6.bb b/meta/recipes-support/npth/npth_1.7.bb
index ef863d39b0..f02a731f85 100644
--- a/meta/recipes-support/npth/npth_1.6.bb
+++ b/meta/recipes-support/npth/npth_1.7.bb
@@ -9,18 +9,14 @@ LIC_FILES_CHKSUM = "\
9UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 9UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
10SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ 10SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \
11 file://pkgconfig.patch \ 11 file://pkgconfig.patch \
12 file://0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch \ 12 file://musl-fix.patch \
13 " 13 "
14 14
15SRC_URI[md5sum] = "375d1a15ad969f32d25f1a7630929854" 15SRC_URI[sha256sum] = "8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05"
16SRC_URI[sha256sum] = "1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1"
17
18BINCONFIG = "${bindir}/npth-config"
19 16
20inherit autotools binconfig-disabled multilib_header 17inherit autotools binconfig-disabled multilib_header
21 18
22FILES:${PN} = "${libdir}/libnpth.so.*" 19FILES:${PN} = "${libdir}/libnpth.so.*"
23FILES:${PN}-dev += "${bindir}/npth-config"
24 20
25do_install:append() { 21do_install:append() {
26 oe_multilib_header npth.h 22 oe_multilib_header npth.h
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-18 00:00:53 +0000