| 1 |
commit: 2796665929bb8baa0d9ffa0e17d1c573b9fdef02 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 1 05:08:28 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 1 05:12:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27966659 |
| 7 |
|
| 8 |
net-nds/openldap: another pthread configure fix |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/871372 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../openldap/files/openldap-2.6.3-clang16.patch | 22 +++++++++++++++++++--- |
| 14 |
...ap-2.6.3-r2.ebuild => openldap-2.6.3-r3.ebuild} | 0 |
| 15 |
2 files changed, 19 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-nds/openldap/files/openldap-2.6.3-clang16.patch b/net-nds/openldap/files/openldap-2.6.3-clang16.patch |
| 18 |
index 216d567329c5..7027197281b2 100644 |
| 19 |
--- a/net-nds/openldap/files/openldap-2.6.3-clang16.patch |
| 20 |
+++ b/net-nds/openldap/files/openldap-2.6.3-clang16.patch |
| 21 |
@@ -78,7 +78,20 @@ Bug: https://bugs.gentoo.org/871372 |
| 22 |
{ |
| 23 |
int epfd = epoll_create(256); |
| 24 |
exit (epfd == -1 ? 1 : 0); |
| 25 |
-@@ -1551,6 +1555,9 @@ dnl esac |
| 26 |
+@@ -1493,10 +1497,8 @@ pthread_rwlock_t rwlock; |
| 27 |
+ dnl save the flags |
| 28 |
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
| 29 |
+ #include <pthread.h> |
| 30 |
+-#ifndef NULL |
| 31 |
+-#define NULL (void*)0 |
| 32 |
+-#endif |
| 33 |
+-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) |
| 34 |
++pthread_t thread; |
| 35 |
++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) |
| 36 |
+ ]) |
| 37 |
+ |
| 38 |
+ if test $ol_cv_func_pthread_detach = no ; then |
| 39 |
+@@ -1551,6 +1553,9 @@ dnl esac |
| 40 |
AC_CACHE_CHECK([if select yields when using pthreads], |
| 41 |
ol_cv_pthread_select_yields,[ |
| 42 |
AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
| 43 |
@@ -88,7 +101,7 @@ Bug: https://bugs.gentoo.org/871372 |
| 44 |
#include <sys/types.h> |
| 45 |
#include <sys/time.h> |
| 46 |
#include <unistd.h> |
| 47 |
-@@ -1561,8 +1568,7 @@ dnl esac |
| 48 |
+@@ -1561,8 +1566,7 @@ dnl esac |
| 49 |
|
| 50 |
static int fildes[2]; |
| 51 |
|
| 52 |
@@ -98,7 +111,7 @@ Bug: https://bugs.gentoo.org/871372 |
| 53 |
{ |
| 54 |
int i; |
| 55 |
struct timeval tv; |
| 56 |
-@@ -1586,9 +1592,7 @@ static void *task(p) |
| 57 |
+@@ -1586,9 +1590,7 @@ static void *task(p) |
| 58 |
exit(0); /* if we exit here, the select blocked the whole process */ |
| 59 |
} |
| 60 |
|
| 61 |
@@ -167,3 +180,6 @@ Bug: https://bugs.gentoo.org/871372 |
| 62 |
{ |
| 63 |
(void)close(LogFile); |
| 64 |
LogFile = -1; |
| 65 |
+-- |
| 66 |
+2.38.1 |
| 67 |
+ |
| 68 |
|
| 69 |
diff --git a/net-nds/openldap/openldap-2.6.3-r2.ebuild b/net-nds/openldap/openldap-2.6.3-r3.ebuild |
| 70 |
similarity index 100% |
| 71 |
rename from net-nds/openldap/openldap-2.6.3-r2.ebuild |
| 72 |
rename to net-nds/openldap/openldap-2.6.3-r3.ebuild |
Archives