[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/

["Sam James" <sam@gentoo.org>]

commit:     56ef5ce33891feec34cd0c39a0a774a81a587dc7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 05:12:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 05:12:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ef5ce3

net-misc/ntp: another pthread configure fix

Closes: https://bugs.gentoo.org/871372
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../ntp/files/ntp-4.2.8_p15-configure-clang16.patch    | 18 ++++++++++++++++++
 ...ntp-4.2.8_p15-r3.ebuild => ntp-4.2.8_p15-r4.ebuild} |  0
 2 files changed, 18 insertions(+)

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
index d0dc2ad014b4..4b52248bde8f 100644
--- 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
@@ -1,6 +1,21 @@
 Sync with OpenLDAP. Uses Arsen's patch from https://bugs.gentoo.org/871288.
 
 https://bugs.gentoo.org/871372
+--- a/sntp/m4/openldap-thread-check.m4
++++ b/sntp/m4/openldap-thread-check.m4
+@@ -262,10 +262,8 @@ pthread_rwlock_t rwlock;
+ 				dnl save the flags
+ 				AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <pthread.h>
+-#ifndef NULL
+-#define NULL (void*)0
+-#endif
+-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
++pthread_t thread;
++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
+ 			])
+ 
+ 			if test $ol_cv_func_pthread_detach = no ; then
 --- a/sntp/m4/openldap.m4
 +++ b/sntp/m4/openldap.m4
 @@ -1,16 +1,16 @@
@@ -590,3 +605,6 @@ https://bugs.gentoo.org/871372
 -#endif
 -	], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
 -])
+-- 
+2.38.1
+

diff --git a/net-misc/ntp/ntp-4.2.8_p15-r3.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild
similarity index 100%
rename from net-misc/ntp/ntp-4.2.8_p15-r3.ebuild
rename to net-misc/ntp/ntp-4.2.8_p15-r4.ebuild