OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Kolab Konsortium via Gunnar
Wro$
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Oct-2007 19:16:20
Branch: HEAD Handle: 2007101118162000
Modified files:
openpkg-src/openldap openldap.spec
Log:
Add with_pth to openldap so that this can also be build without using
pth. Patch provided by Thomas A. Hein.
Summary:
Revision Changes Path
1.197 +10 -5 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.196 -r1.197 openldap.spec
--- openpkg-src/openldap/openldap.spec 5 Oct 2007 07:59:24 -0000
1.196
+++ openpkg-src/openldap/openldap.spec 11 Oct 2007 17:16:20 -0000
1.197
@@ -33,13 +33,14 @@
Group: LDAP
License: GPL
Version: 2.3.38
-Release: 20071005
+Release: 20071011
# package options
%option with_server yes
%option with_fsl yes
%option with_crypt yes
%option with_overlays yes
+%option with_pth yes
%option with_sasl no
%option with_perl no
%option with_odbc no
@@ -56,12 +57,16 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: readline, openssl, db >= 4.2, pth
-PreReq: readline, openssl, db >= 4.2, pth
+BuildPreReq: readline, openssl, db >= 4.2
+PreReq: readline, openssl, db >= 4.2
%if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
+%if "%{with_server}" == "yes" && "%{with_pth}" == "yes"
+BuildPreReq: pth
+PreReq: pth
+%endif
%if "%{with_sasl}" == "yes"
BuildPreReq: sasl
PreReq: sasl
@@ -144,7 +149,7 @@
%endif
# configuration: force to use GNU pth
-%if "%{with_server}" == "yes"
+%if "%{with_server}" == "yes" && "%{with_pth}" == "yes"
CFLAGS="$CFLAGS `%{l_prefix}/bin/pth-config --cflags`"
CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/bin/pth-config --includedir`"
LDFLAGS="$LDFLAGS `%{l_prefix}/bin/pth-config --ldflags`"
@@ -190,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[234];%{l_prefix}/lib/libdb.a;g' \
+ -e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
-e 's;<db\.h>;"db.h";g' \
configure
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
