aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreik <eik@FreeBSD.org>2004-03-01 02:19:21 +0800
committereik <eik@FreeBSD.org>2004-03-01 02:19:21 +0800
commit38e242bc8c81a5e61f05f1e9d7153f800246ca3b (patch)
treef7befa0c20412adc0a152785e10f9143eb72be01
parent0b1ffc53db8df96417c2cfe6dd013253a3ea62c9 (diff)
downloadfreebsd-ports-gnome-38e242bc8c81a5e61f05f1e9d7153f800246ca3b.tar.gz
freebsd-ports-gnome-38e242bc8c81a5e61f05f1e9d7153f800246ca3b.tar.zst
freebsd-ports-gnome-38e242bc8c81a5e61f05f1e9d7153f800246ca3b.zip
Introduce WITHOUT_BDB to work around a bug in BerkeleyDB on AMD64:
<http://www.openldap.org/lists/openldap-software/200402/msg00756.html>
-rw-r--r--net/openldap21-server/Makefile9
-rw-r--r--net/openldap22-server/Makefile9
-rw-r--r--net/openldap23-server/Makefile9
-rw-r--r--net/openldap24-server/Makefile9
4 files changed, 32 insertions, 4 deletions
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index 1e5607069165..94bb4100c491 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -113,7 +113,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--enable-ldbm \
- --with-ldbm-api=berkeley \
--enable-crypt \
--enable-lmpasswd \
--enable-ldap \
@@ -122,6 +121,12 @@ CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--enable-null \
--enable-monitor
+.if defined(WITHOUT_BDB)
+CONFIGURE_ARGS+= --with-ldbm-api=bcompat \
+ --disable-bdb
+.else
+CONFIGURE_ARGS+= --with-ldbm-api=berkeley
+
WITH_BDB_VER?= 41
.if ${WITH_BDB_VER} == 42
@@ -145,6 +150,7 @@ LIBS+= -ldb-4.2
LIBS+= -ldb${WITH_BDB_VER}
.endif
CPPFLAGS+= -I${LOCALBASE}/include/db${WITH_BDB_VER}
+.endif
.if defined(WITH_SHELL)
CONFIGURE_ARGS+= --enable-shell
@@ -228,6 +234,7 @@ pre-everything::
@${ECHO} "WITH_ODBC with SQL backend"
@${ECHO} "WITH_ODBC_TYPE select ODBC interface (iODBC or unixODBC)"
@${ECHO} "WITHOUT_TCP_WRAPPERS without tcp wrapper support"
+ @${ECHO} "WITHOUT_BDB without BerkeleyDB support"
.endif
@${ECHO}
@${ECHO} "============================================================="
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 74da56240ecc..cea180c9f2df 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -113,7 +113,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--enable-ldbm \
- --with-ldbm-api=berkeley \
--enable-crypt \
--enable-lmpasswd \
--enable-ldap \
@@ -124,6 +123,12 @@ CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
WITH_BDB_VER?= 42
+.if defined(WITHOUT_BDB)
+CONFIGURE_ARGS+= --with-ldbm-api=bcompat \
+ --disable-bdb
+.else
+CONFIGURE_ARGS+= --with-ldbm-api=berkeley
+
.if ${WITH_BDB_VER} == 42
LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+= --enable-bdb
@@ -145,6 +150,7 @@ LIBS+= -ldb-4.2
LIBS+= -ldb${WITH_BDB_VER}
.endif
CPPFLAGS+= -I${LOCALBASE}/include/db${WITH_BDB_VER}
+.endif
.if defined(WITH_SHELL)
CONFIGURE_ARGS+= --enable-shell
@@ -238,6 +244,7 @@ pre-everything::
@${ECHO} "WITH_ODBC_TYPE select ODBC interface (iODBC or unixODBC)"
@${ECHO} "WITH_SLAPI with Netscape SLAPI plugin API
@${ECHO} "WITHOUT_TCP_WRAPPERS without tcp wrapper support"
+ @${ECHO} "WITHOUT_BDB without BerkeleyDB support"
.endif
@${ECHO}
@${ECHO} "============================================================="
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 74da56240ecc..cea180c9f2df 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -113,7 +113,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--enable-ldbm \
- --with-ldbm-api=berkeley \
--enable-crypt \
--enable-lmpasswd \
--enable-ldap \
@@ -124,6 +123,12 @@ CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
WITH_BDB_VER?= 42
+.if defined(WITHOUT_BDB)
+CONFIGURE_ARGS+= --with-ldbm-api=bcompat \
+ --disable-bdb
+.else
+CONFIGURE_ARGS+= --with-ldbm-api=berkeley
+
.if ${WITH_BDB_VER} == 42
LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+= --enable-bdb
@@ -145,6 +150,7 @@ LIBS+= -ldb-4.2
LIBS+= -ldb${WITH_BDB_VER}
.endif
CPPFLAGS+= -I${LOCALBASE}/include/db${WITH_BDB_VER}
+.endif
.if defined(WITH_SHELL)
CONFIGURE_ARGS+= --enable-shell
@@ -238,6 +244,7 @@ pre-everything::
@${ECHO} "WITH_ODBC_TYPE select ODBC interface (iODBC or unixODBC)"
@${ECHO} "WITH_SLAPI with Netscape SLAPI plugin API
@${ECHO} "WITHOUT_TCP_WRAPPERS without tcp wrapper support"
+ @${ECHO} "WITHOUT_BDB without BerkeleyDB support"
.endif
@${ECHO}
@${ECHO} "============================================================="
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 74da56240ecc..cea180c9f2df 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -113,7 +113,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--enable-ldbm \
- --with-ldbm-api=berkeley \
--enable-crypt \
--enable-lmpasswd \
--enable-ldap \
@@ -124,6 +123,12 @@ CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
WITH_BDB_VER?= 42
+.if defined(WITHOUT_BDB)
+CONFIGURE_ARGS+= --with-ldbm-api=bcompat \
+ --disable-bdb
+.else
+CONFIGURE_ARGS+= --with-ldbm-api=berkeley
+
.if ${WITH_BDB_VER} == 42
LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+= --enable-bdb
@@ -145,6 +150,7 @@ LIBS+= -ldb-4.2
LIBS+= -ldb${WITH_BDB_VER}
.endif
CPPFLAGS+= -I${LOCALBASE}/include/db${WITH_BDB_VER}
+.endif
.if defined(WITH_SHELL)
CONFIGURE_ARGS+= --enable-shell
@@ -238,6 +244,7 @@ pre-everything::
@${ECHO} "WITH_ODBC_TYPE select ODBC interface (iODBC or unixODBC)"
@${ECHO} "WITH_SLAPI with Netscape SLAPI plugin API
@${ECHO} "WITHOUT_TCP_WRAPPERS without tcp wrapper support"
+ @${ECHO} "WITHOUT_BDB without BerkeleyDB support"
.endif
@${ECHO}
@${ECHO} "============================================================="