summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-02-01 19:22:55 +0000
committerjlam <jlam@pkgsrc.org>2002-02-01 19:22:55 +0000
commit75ddd174fa12e5626c155fdc6d6a32316d5a04aa (patch)
treea453408469130bba889c693a9015f1ef638e704e /databases
parent890dfbe9bc65e7e674f9036f7c4f54add8689d16 (diff)
downloadpkgsrc-75ddd174fa12e5626c155fdc6d6a32316d5a04aa.tar.gz
Make this work if openldap doesn't use pthreads.
Diffstat (limited to 'databases')
-rw-r--r--databases/php4-ldap/Makefile3
-rw-r--r--databases/php4-ldap/distinfo4
-rw-r--r--databases/php4-ldap/patches/patch-aa28
3 files changed, 17 insertions, 18 deletions
diff --git a/databases/php4-ldap/Makefile b/databases/php4-ldap/Makefile
index 17755d73398..68fe5aff1ba 100644
--- a/databases/php4-ldap/Makefile
+++ b/databases/php4-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/12/03 08:30:59 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/02/01 19:22:55 jlam Exp $
.include "../../www/php4/Makefile.module"
@@ -9,6 +9,7 @@ COMMENT= PHP4 extension for LDAP database access
USE_BUILDLINK_ONLY= YES
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_DIR}
+CONFIGURE_ENV+= PTHREAD_TYPE="${PTHREAD_TYPE}"
.include "../../databases/openldap/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/php4-ldap/distinfo b/databases/php4-ldap/distinfo
index baa7d612e6e..041aadcd64c 100644
--- a/databases/php4-ldap/distinfo
+++ b/databases/php4-ldap/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/01/06 19:54:45 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/02/01 19:22:55 jlam Exp $
SHA1 (php-4.1.1.tar.gz) = 3a926707819f5ea0dfa03785078f96a39d85e086
Size (php-4.1.1.tar.gz) = 3356062 bytes
-SHA1 (patch-aa) = 92c51a3de064c7364b47c24d85d1b0537d70216e
+SHA1 (patch-aa) = 29c55477c62a3776b56cc6976f43cc8e5d4de390
diff --git a/databases/php4-ldap/patches/patch-aa b/databases/php4-ldap/patches/patch-aa
index 9561c2db4b4..2148af071a1 100644
--- a/databases/php4-ldap/patches/patch-aa
+++ b/databases/php4-ldap/patches/patch-aa
@@ -1,24 +1,22 @@
-$NetBSD: patch-aa,v 1.1 2001/12/31 23:55:55 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/02/01 19:22:55 jlam Exp $
--- config.m4.orig Mon May 21 15:47:15 2001
+++ config.m4
-@@ -36,18 +36,8 @@
- AC_MSG_ERROR(Cannot find ldap.h)
- fi
+@@ -41,13 +41,16 @@
+ dnl these here if necessary. -RL
+ dnl Is this really necessary? -Troels Arvin
-- dnl The Linux version of the SDK need -lpthread
-- dnl I have tested Solaris, and it doesn't, but others may. Add
-- dnl these here if necessary. -RL
-- dnl Is this really necessary? -Troels Arvin
--
- if test `uname` = "Linux"; then
-- LDAP_PTHREAD=pthread
-- else
-- LDAP_PTHREAD=
-- fi
--
++ if test "x${PTHREAD_TYPE}" = "xnative"; then
+ LDAP_PTHREAD=pthread
+ else
+ LDAP_PTHREAD=
+ fi
+
if test -f $LDAP_LIBDIR/liblber.a -o -f $LDAP_LIBDIR/liblber.so -o -f $LDAP_LIBDIR/liblber.sl; then
-+ PHP_ADD_LIBRARY_WITH_PATH(pthread, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
++ if test -n "$LDAP_PTHREAD"; then
++ PHP_ADD_LIBRARY_WITH_PATH($LDAP_PTHREAD, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
++ fi
PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)