[pkgsrc/trunk]: pkgsrc/databases/openldap If the threads are non-native, then...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e5208f7b5d92
branches:  trunk
changeset: 469069:e5208f7b5d92
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Feb 19 14:42:39 2004 +0000

description:
If the threads are non-native, then don't build openldap with threads
support.  The slapd built without threads passes all of its test except
for the replication test, which is because slurpd is not built (slurpd
requires threads).  Bump the PKGREVISION.

This is in response to PR 24473.  As a debugging aid in case someone
attempts to really fix the PR, if _OPENLDAP_REQUIRE_THREADS is "yes",
then openldap will forcibly build using GNU pth if native threads
aren't available.

diffstat:

 databases/openldap/Makefile |  23 +++++++++++++++++++----
 databases/openldap/PLIST    |   6 +++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diffs (83 lines):

diff -r 653445a838e3 -r e5208f7b5d92 databases/openldap/Makefile
--- a/databases/openldap/Makefile       Thu Feb 19 14:27:35 2004 +0000
+++ b/databases/openldap/Makefile       Thu Feb 19 14:42:39 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2004/02/14 17:21:36 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2004/02/19 14:42:39 jlam Exp $
 
 DISTNAME=              openldap-2.1.25
 SVR4_PKGNAME=          oldap
+PKGREVISION=           1
 CATEGORIES=            databases
 MASTER_SITES=          ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=          .tgz
@@ -18,8 +19,6 @@
 USE_PKGINSTALL=                YES
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
-PTHREAD_OPTS+=         require
-
 TEST_TARGET=           test
 
 PKG_SYSCONFSUBDIR=     openldap
@@ -88,7 +87,18 @@
 .for FILE in ${SUPPS}
 SUPPORT_FILES+=                ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
 .endfor
-RCD_SCRIPTS=           slapd slurpd
+RCD_SCRIPTS=           slapd
+
+# While the package does build correctly using GNU pth, slapd isn't able to
+# pass "make test" without segfaulting at startup.  For now, just build
+# without threads-support if it's not a native thread library.
+#
+.if defined(_OPENLDAP_REQUIRE_THREADS) && \
+    !empty(_OPENLDAP_REQUIRE_THREADS:M[yY][eE][sS])
+PTHREAD_OPTS+=         require
+.else
+PTHREAD_OPTS+=         native
+.endif
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
@@ -97,8 +107,13 @@
 
 .if ${PTHREAD_TYPE} == "native"
 CONFIGURE_ARGS+=       --with-threads
+PLIST_SUBST+=          SLURPD_COMMENT=
+RCD_SCRIPTS+=          slurpd
 .elif ${PTHREAD_TYPE} == "pth"
 CONFIGURE_ARGS+=       --with-threads=pth
+.else
+CONFIGURE_ARGS+=       --without-threads
+PLIST_SUBST+=          SLURPD_COMMENT="@comment "
 .endif
 
 post-install:
diff -r 653445a838e3 -r e5208f7b5d92 databases/openldap/PLIST
--- a/databases/openldap/PLIST  Thu Feb 19 14:27:35 2004 +0000
+++ b/databases/openldap/PLIST  Thu Feb 19 14:42:39 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/02/18 14:00:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/02/19 14:42:39 jlam Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -8,7 +8,7 @@
 bin/ldapsearch
 bin/ldapwhoami
 etc/rc.d/slapd
-etc/rc.d/slurpd
+${SLURPD_COMMENT}etc/rc.d/slurpd
 include/lber.h
 include/lber_types.h
 include/ldap.h
@@ -32,7 +32,7 @@
 lib/libldap_r.so.2
 lib/libldap_r.so.2.124
 libexec/slapd
-libexec/slurpd
+${SLURPD_COMMENT}libexec/slurpd
 man/man1/ldapadd.1
 man/man1/ldapcompare.1
 man/man1/ldapdelete.1