diff options
Diffstat (limited to 'meta/recipes-support/npth/npth')
3 files changed, 79 insertions, 75 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 @@ | |||
1 | From e43524868bb4901703d63876f9d49f73ca75b3ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 12 May 2021 20:27:52 -0700 | ||
4 | Subject: [PATCH] Revert "Fix problem with regression tests on recent glibc." | ||
5 | |||
6 | This reverts commit 3a9d32eb59194b989656548755066ccd9feb36ac. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | configure.ac | 8 +++----- | ||
12 | 1 file changed, 3 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 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 | -- | ||
42 | 2.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 @@ | |||
1 | From 417abd56fd7bf45cd4948414050615cb1ad59134 Mon Sep 17 00:00:00 2001 | ||
2 | From: NIIBE Yutaka <gniibe@fsij.org> | ||
3 | Date: Fri, 1 Mar 2024 13:53:52 +0900 | ||
4 | Subject: [PATCH] Fix INSERT_EXPOSE_RWLOCK_API for musl C library. | ||
5 | |||
6 | * configure.ac: Add a case for musl system. | ||
7 | |||
8 | Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=417abd56fd7bf45cd4948414050615cb1ad59134] | ||
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
10 | -- | ||
11 | |||
12 | GnuPG-bug-id: 5664 | ||
13 | Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> | ||
14 | --- | ||
15 | configure.ac | 5 ++++- | ||
16 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index 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 | -- | ||
35 | 2.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 @@ | |||
1 | Added npth pkgconfig file | 1 | From ff19a9648f1c7d93087e2c33ca64bb881d53ea5a Mon Sep 17 00:00:00 2001 |
2 | From: Saul Wold <sgw@linux.intel.com> | ||
3 | Date: Mon, 10 Nov 2014 13:59:03 -0800 | ||
4 | Subject: [PATCH] Added npth pkgconfig file | ||
2 | 5 | ||
3 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
4 | 7 | ||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | 8 | Signed-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 | ||
7 | Index: npth-1.1/src/npth.pc.in | 16 | diff --git a/configure.ac b/configure.ac |
8 | =================================================================== | 17 | index 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 " | ||
28 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
29 | index 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 | |||
44 | diff --git a/src/npth.pc.in b/src/npth.pc.in | ||
45 | new file mode 100644 | ||
46 | index 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} |
22 | Index: 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 | |||
38 | Index: 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 " | ||