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 21:26:12
Branch: HEAD Handle: 2007062220261200
Modified files:
openpkg-src/apr apr.patch apr.spec
Log:
fix building against various hash libraries and select SDBM as the
default one always for consistency reasons
Summary:
Revision Changes Path
1.9 +15 -2 openpkg-src/apr/apr.patch
1.44 +9 -3 openpkg-src/apr/apr.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 apr.patch
--- openpkg-src/apr/apr.patch 22 Jun 2007 18:44:54 -0000 1.8
+++ openpkg-src/apr/apr.patch 22 Jun 2007 19:26:12 -0000 1.9
@@ -1,6 +1,6 @@
Index: apr-util-1.2.8/apu-config.in
--- apr-util-1.2.8/apu-config.in.orig 2005-02-04 21:45:35 +0100
-+++ apr-util-1.2.8/apu-config.in 2007-06-22 20:21:09 +0200
++++ apr-util-1.2.8/apu-config.in 2007-06-22 21:17:03 +0200
@@ -27,7 +27,7 @@
libdir="@libdir@"
includedir="@includedir@"
@@ -12,7 +12,7 @@
Index: apr-util-1.2.8/crypto/getuuid.c
--- apr-util-1.2.8/crypto/getuuid.c.orig 2006-04-14 20:01:58 +0200
-+++ apr-util-1.2.8/crypto/getuuid.c 2007-06-22 20:21:09 +0200
++++ apr-util-1.2.8/crypto/getuuid.c 2007-06-22 21:17:03 +0200
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -22,3 +22,16 @@
srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
return rand() & 0x0FFFF;
+Index: apr-util-1.2.8/include/private/apu_select_dbm.h.in
+--- apr-util-1.2.8/include/private/apu_select_dbm.h.in.orig 2005-06-14
16:15:16 +0200
++++ apr-util-1.2.8/include/private/apu_select_dbm.h.in 2007-06-22
21:21:19 +0200
+@@ -25,4 +25,9 @@
+ #define APU_USE_GDBM @apu_use_gdbm@
+ #define APU_USE_DB @apu_use_db@
+
++#define APU_HAVE_SDBM @apu_have_sdbm@
++#define APU_HAVE_NDBM @apu_have_ndbm@
++#define APU_HAVE_GDBM @apu_have_gdbm@
++#define APU_HAVE_DB @apu_have_db@
++
+ #endif /* !APU_SELECT_DBM_H */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 apr.spec
--- openpkg-src/apr/apr.spec 22 Jun 2007 18:44:54 -0000 1.43
+++ openpkg-src/apr/apr.spec 22 Jun 2007 19:26:12 -0000 1.44
@@ -42,6 +42,7 @@
# package options
%option with_threads no
%option with_db no
+%option with_gdbm no
%option with_iconv no
%option with_ldap no
@@ -61,6 +62,10 @@
BuildPreReq: db
PreReq: db
%endif
+%if "%{with_gdbm}" == "yes"
+BuildPreReq: gdbm
+PreReq: gdbm
+%endif
%if "%{with_iconv}" == "yes"
BuildPreReq: libiconv
PreReq: libiconv
@@ -124,11 +129,12 @@
--includedir=%{l_prefix}/include/apr \
--datadir=%{l_prefix}/share/apr \
--with-apr=`pwd`/../apr-%{V_apr} \
+ --with-dbm=sdbm \
%if "%{with_db}" == "yes"
- --with-dbm=db45 \
--with-berkeley-db=%{l_prefix} \
-%else
- --with-dbm=sdbm \
+%endif
+%if "%{with_gdbm}" == "yes"
+ --with-gdbm=%{l_prefix} \
%endif
--with-expat=%{l_prefix} \
%if "%{with_iconv}" == "yes"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
