OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Oct-2007 14:53:36
Branch: HEAD Handle: 2007101813533600
Modified files:
openpkg-src/openldap openldap.spec
Log:
OpenLDAP 2.3.x is incompatible with Berkeley-DB >= 4.6. Also 2.3.39
and higher will not solve the problem. Only OpenLDAP 2.4.x were x >= 5
will be compatible with Berkeley-DB 4.6, so until this OpenLDAP
version is available we have to use Berkeley-DB 4.5 :-(
Summary:
Revision Changes Path
1.201 +5 -5 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.200 -r1.201 openldap.spec
--- openpkg-src/openldap/openldap.spec 18 Oct 2007 09:55:15 -0000
1.200
+++ openpkg-src/openldap/openldap.spec 18 Oct 2007 12:53:36 -0000
1.201
@@ -57,8 +57,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: readline, openssl, db >= 4.2
-PreReq: readline, openssl, db >= 4.2
+BuildPreReq: readline, openssl, db45
+PreReq: readline, openssl, db45
%if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -105,8 +105,8 @@
# configuration: standard build flags
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
- export CPPFLAGS="%{l_cppflags}"
- export LDFLAGS="%{l_ldflags}"
+ export CPPFLAGS="%{l_cppflags db45 .}"
+ export LDFLAGS="%{l_ldflags db45 .}"
export LIBS=""
export ARGS=""
ARGS="$ARGS --prefix=%{l_prefix}"
@@ -195,7 +195,7 @@
# configuration: use hard-links and make sure our Berkeley-DB is
picked up first
%{l_shtool} subst \
-e 's;ln -s;ln;g' \
- -e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
+ -e 's;-ldb4[1-9];%{l_prefix}/lib/db45/libdb.a;g' \
-e 's;<db\.h>;"db.h";g' \
configure
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
