1 |
commit: 56ef5ce33891feec34cd0c39a0a774a81a587dc7 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 1 05:12:50 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 1 05:12:59 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ef5ce3 |
7 |
|
8 |
net-misc/ntp: another pthread configure fix |
9 |
|
10 |
Closes: https://bugs.gentoo.org/871372 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../ntp/files/ntp-4.2.8_p15-configure-clang16.patch | 18 ++++++++++++++++++ |
14 |
...ntp-4.2.8_p15-r3.ebuild => ntp-4.2.8_p15-r4.ebuild} | 0 |
15 |
2 files changed, 18 insertions(+) |
16 |
|
17 |
diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch |
18 |
index d0dc2ad014b4..4b52248bde8f 100644 |
19 |
--- a/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch |
20 |
+++ b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch |
21 |
@@ -1,6 +1,21 @@ |
22 |
Sync with OpenLDAP. Uses Arsen's patch from https://bugs.gentoo.org/871288. |
23 |
|
24 |
https://bugs.gentoo.org/871372 |
25 |
+--- a/sntp/m4/openldap-thread-check.m4 |
26 |
++++ b/sntp/m4/openldap-thread-check.m4 |
27 |
+@@ -262,10 +262,8 @@ pthread_rwlock_t rwlock; |
28 |
+ dnl save the flags |
29 |
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
30 |
+ #include <pthread.h> |
31 |
+-#ifndef NULL |
32 |
+-#define NULL (void*)0 |
33 |
+-#endif |
34 |
+-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) |
35 |
++pthread_t thread; |
36 |
++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) |
37 |
+ ]) |
38 |
+ |
39 |
+ if test $ol_cv_func_pthread_detach = no ; then |
40 |
--- a/sntp/m4/openldap.m4 |
41 |
+++ b/sntp/m4/openldap.m4 |
42 |
@@ -1,16 +1,16 @@ |
43 |
@@ -590,3 +605,6 @@ https://bugs.gentoo.org/871372 |
44 |
-#endif |
45 |
- ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) |
46 |
-]) |
47 |
+-- |
48 |
+2.38.1 |
49 |
+ |
50 |
|
51 |
diff --git a/net-misc/ntp/ntp-4.2.8_p15-r3.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild |
52 |
similarity index 100% |
53 |
rename from net-misc/ntp/ntp-4.2.8_p15-r3.ebuild |
54 |
rename to net-misc/ntp/ntp-4.2.8_p15-r4.ebuild |