From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1462244-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BC37E158021
for <garchives@archives.gentoo.org>; Thu, 1 Dec 2022 05:17:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DC048E07D1;
Thu, 1 Dec 2022 05:17:56 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C336CE07D1
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Dec 2022 05:17:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C08E4340F81
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Dec 2022 05:17:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 366E862B
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Dec 2022 05:17:54 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1669871578.2796665929bb8baa0d9ffa0e17d1c573b9fdef02.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/, net-nds/openldap/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-nds/openldap/files/openldap-2.6.3-clang16.patch net-nds/openldap/openldap-2.6.3-r2.ebuild net-nds/openldap/openldap-2.6.3-r3.ebuild
X-VCS-Directories: net-nds/openldap/files/ net-nds/openldap/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 2796665929bb8baa0d9ffa0e17d1c573b9fdef02
X-VCS-Branch: master
Date: Thu, 1 Dec 2022 05:17:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 33a55d84-267a-43e2-b06d-b24cfef1331d
X-Archives-Hash: 660f7644bdca65eaf725fe3de47522f8
commit: 2796665929bb8baa0d9ffa0e17d1c573b9fdef02
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 05:08:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 05:12:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27966659
net-nds/openldap: another pthread configure fix
Bug: https://bugs.gentoo.org/871372
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../openldap/files/openldap-2.6.3-clang16.patch | 22 +++++++++++++++++++---
...ap-2.6.3-r2.ebuild => openldap-2.6.3-r3.ebuild} | 0
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/net-nds/openldap/files/openldap-2.6.3-clang16.patch b/net-nds/openldap/files/openldap-2.6.3-clang16.patch
index 216d567329c5..7027197281b2 100644
--- a/net-nds/openldap/files/openldap-2.6.3-clang16.patch
+++ b/net-nds/openldap/files/openldap-2.6.3-clang16.patch
@@ -78,7 +78,20 @@ Bug: https://bugs.gentoo.org/871372
{
int epfd = epoll_create(256);
exit (epfd == -1 ? 1 : 0);
-@@ -1551,6 +1555,9 @@ dnl esac
+@@ -1493,10 +1497,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
+@@ -1551,6 +1553,9 @@ dnl esac
AC_CACHE_CHECK([if select yields when using pthreads],
ol_cv_pthread_select_yields,[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -88,7 +101,7 @@ Bug: https://bugs.gentoo.org/871372
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
-@@ -1561,8 +1568,7 @@ dnl esac
+@@ -1561,8 +1566,7 @@ dnl esac
static int fildes[2];
@@ -98,7 +111,7 @@ Bug: https://bugs.gentoo.org/871372
{
int i;
struct timeval tv;
-@@ -1586,9 +1592,7 @@ static void *task(p)
+@@ -1586,9 +1590,7 @@ static void *task(p)
exit(0); /* if we exit here, the select blocked the whole process */
}
@@ -167,3 +180,6 @@ Bug: https://bugs.gentoo.org/871372
{
(void)close(LogFile);
LogFile = -1;
+--
+2.38.1
+
diff --git a/net-nds/openldap/openldap-2.6.3-r2.ebuild b/net-nds/openldap/openldap-2.6.3-r3.ebuild
similarity index 100%
rename from net-nds/openldap/openldap-2.6.3-r2.ebuild
rename to net-nds/openldap/openldap-2.6.3-r3.ebuild