diff options
| author | simonb <simonb> | 1999-09-17 06:46:31 +0000 |
|---|---|---|
| committer | simonb <simonb> | 1999-09-17 06:46:31 +0000 |
| commit | 03a38d1774c13abe094f17adb4d00a90fdb49fa0 (patch) | |
| tree | 5f07fe302c763c0674ec2f6a5f4ab2d79f501127 /databases | |
| parent | 6766fa7dfa431eaea78b6f948aaea5e42d2fa42f (diff) | |
| download | pkgsrc-03a38d1774c13abe094f17adb4d00a90fdb49fa0.tar.gz | |
Work around ELF bug with libwrap in a similar way to the ucd-snmp
package (pointed out by David Brownlee). We also need to remove -lwrap
from the tools directory libraries - hence the post-configure target to
make sure SLAPD_LIBS is empty in servers/slapd/tools/Makefile.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/openldap/Makefile | 5 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-aa | 32 |
2 files changed, 29 insertions, 8 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 9bf0a6d02c4..68d96649208 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 1999/09/14 02:32:21 kim Exp $ +# $NetBSD: Makefile,v 1.13 1999/09/17 06:46:31 simonb Exp $ # DISTNAME= openldap-1.2.7 @@ -23,6 +23,9 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-dns --enable-cldap \ --enable-wrappers --enable-passwd --enable-shell +post-configure: + ${ECHO} "SLAPD_LIBS = " >> ${WRKSRC}/servers/slapd/tools/Makefile + .include "../../mk/bsd.prefs.mk" .if defined(KERBEROS) && ${KERBEROS} == 4 diff --git a/databases/openldap/patches/patch-aa b/databases/openldap/patches/patch-aa index da3a621b77d..d4ea0dd0bfd 100644 --- a/databases/openldap/patches/patch-aa +++ b/databases/openldap/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 1999/09/10 10:41:41 hwr Exp $ +$NetBSD: patch-aa,v 1.3 1999/09/17 06:46:32 simonb Exp $ ---- configure.orig Wed Aug 25 20:39:37 1999 -+++ configure Fri Sep 10 12:11:36 1999 +--- configure.orig Thu Aug 26 04:39:37 1999 ++++ configure Wed Sep 15 11:47:45 1999 @@ -2318,6 +2318,7 @@ # Save cache, so that ltconfig can load it @@ -10,12 +10,30 @@ $NetBSD: patch-aa,v 1.2 1999/09/10 10:41:41 hwr Exp $ # Actually configure libtool. ac_aux_dir is where install-sh is found. CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -@@ -2335,6 +2336,8 @@ - +@@ -2336,6 +2337,8 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+ -+fi ++fi ++ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. + exec 5>>./config.log +@@ -7064,6 +7067,7 @@ + if test $ac_cv_header_tcpd_h != yes ; then + have_wrappers=no + else ++if false; then + echo $ac_n "checking for main in -lwrap""... $ac_c" 1>&6 + echo "configure:7069: checking for main in -lwrap" >&5 + ac_lib_var=`echo wrap'_'main | sed 'y%./+-:%__p__%'` +@@ -7099,6 +7103,9 @@ + else + echo "$ac_t""no" 1>&6 + have_wrappers=no ++fi ++else ++ have_wrappers=yes + fi + + fi |