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: 03-Nov-2007 12:40:36
Branch: HEAD Handle: 2007110311403500
Modified files:
openpkg-src/openldap openldap.spec
Log:
allow one to build OpenLDAP against system/vendor Pthreads API, too
(with_pth=no is required for this or GNU Pth still takes preference)
Summary:
Revision Changes Path
1.209 +13 -3 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.208 -r1.209 openldap.spec
--- openpkg-src/openldap/openldap.spec 3 Nov 2007 11:25:35 -0000
1.208
+++ openpkg-src/openldap/openldap.spec 3 Nov 2007 11:40:35 -0000
1.209
@@ -41,6 +41,7 @@
%option with_crypt yes
%option with_overlays yes
%option with_pth yes
+%option with_pthreads no
%option with_sasl no
%option with_perl no
%option with_odbc no
@@ -63,6 +64,10 @@
BuildPreReq: fsl
PreReq: fsl
%endif
+%if "%{with_server}" == "yes" && "%{with_pthreads}" == "yes"
+BuildPreReq: db::with_pthreads = yes
+PreReq: db::with_pthreads = yes
+%endif
%if "%{with_server}" == "yes" && "%{with_pth}" == "yes"
BuildPreReq: pth
PreReq: pth
@@ -149,16 +154,21 @@
%endif
# configuration: force to use GNU pth if enabled
-%if "%{with_server}" == "yes" && "%{with_pth}" == "yes"
+%if "%{with_server}" == "yes"
+%if "%{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`"
LIBS="`%{l_prefix}/bin/pth-config --libs` $LIBS"
ARGS="$ARGS --with-threads=pth"
-%endif
-%if "%{with_server}" == "yes" && "%{with_pth}" != "yes"
+%else
+%if "%{with_pthreads}" == "yes"
+ ARGS="$ARGS --with-threads=posix"
+%else
ARGS="$ARGS --with-threads=no"
%endif
+%endif
+%endif
# configuration: optional overlay support
%if "%{with_server}" == "yes" && "%{with_overlays}" == "yes"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
