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: 22-Jun-2007 11:42:04
Branch: HEAD Handle: 2007062210420300
Modified files:
openpkg-src/apr apr.patch apr.spec
Log:
allow DB by default replaced with SDBM to avoid dependency, make ICONV
support optional and add optional LDAP support
Summary:
Revision Changes Path
1.7 +13 -1 openpkg-src/apr/apr.patch
1.42 +32 -3 openpkg-src/apr/apr.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 apr.patch
--- openpkg-src/apr/apr.patch 22 Jun 2007 09:01:11 -0000 1.6
+++ openpkg-src/apr/apr.patch 22 Jun 2007 09:42:03 -0000 1.7
@@ -1,6 +1,18 @@
+Index: apu-config.in
+--- apu-config.in.orig 2005-02-04 21:45:35 +0100
++++ apu-config.in 2007-06-22 11:27:19 +0200
+@@ -27,7 +27,7 @@
+ libdir="@libdir@"
+ includedir="@includedir@"
+
+-LIBS="@APRUTIL_EXPORT_LIBS@"
++LIBS="@APRUTIL_EXPORT_LIBS@ @LIBS@"
+ INCLUDES="@APRUTIL_INCLUDES@"
+ LDFLAGS="@APRUTIL_LDFLAGS@"
+
Index: crypto/getuuid.c
--- crypto/getuuid.c.orig 2006-04-14 20:01:58 +0200
-+++ crypto/getuuid.c 2007-01-10 19:46:27 +0100
++++ crypto/getuuid.c 2007-06-22 11:27:08 +0200
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 apr.spec
--- openpkg-src/apr/apr.spec 22 Jun 2007 09:17:38 -0000 1.41
+++ openpkg-src/apr/apr.spec 22 Jun 2007 09:42:03 -0000 1.42
@@ -37,6 +37,9 @@
# package options
%option with_threads no
+%option with_db no
+%option with_iconv no
+%option with_ldap no
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
@@ -48,8 +51,20 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: db, expat, libiconv
-PreReq: db, expat, libiconv
+BuildPreReq: expat
+PreReq: expat
+%if "%{with_db}" == "yes"
+BuildPreReq: db
+PreReq: db
+%endif
+%if "%{with_iconv}" == "yes"
+BuildPreReq: libiconv
+PreReq: libiconv
+%endif
+%if "%{with_ldap}" == "yes"
+BuildPreReq: openldap, openssl >= 0.9.8
+PreReq: openldap, openssl >= 0.9.8
+%endif
AutoReq: no
AutoReqProv: no
@@ -96,16 +111,30 @@
( cd apr-util-%{version}
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+%if "%{with_ldap}" == "yes"
+ LIBS="-lssl -lcrypto" \
+%endif
./configure \
--with-apr=`pwd`/../apr-%{version} \
--enable-layout=GNU \
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/apr \
--datadir=%{l_prefix}/share/apr \
+%if "%{with_db}" == "yes"
--with-dbm=db45 \
--with-berkeley-db=%{l_prefix} \
+%else
+ --with-dbm=sdbm \
+%endif
--with-expat=%{l_prefix} \
- --with-iconv=%{l_prefix}
+%if "%{with_iconv}" == "yes"
+ --with-iconv=%{l_prefix} \
+%endif
+%if "%{with_ldap}" == "yes"
+ --with-ldap \
+ --with-ldap-include=%{l_prefix}/include/ \
+ --with-ldap-lib=%{l_prefix}/lib \
+%endif
--disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
