| 1 |
neurogeek 11/07/29 20:43:44 |
| 2 |
|
| 3 |
Added: apr-util-1.3.12-bdb-5.2.patch |
| 4 |
Log: |
| 5 |
Version bump. Ebuild and patch by Arfrever. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha46/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: apr-util-1.3.12-bdb-5.2.patch |
| 16 |
=================================================================== |
| 17 |
--- build/dbm.m4 |
| 18 |
+++ build/dbm.m4 |
| 19 |
@@ -579,6 +579,25 @@ |
| 20 |
apu_db_version=5 |
| 21 |
fi |
| 22 |
]) |
| 23 |
+dnl |
| 24 |
+dnl APU_CHECK_DB52: is DB5.2 present? |
| 25 |
+dnl |
| 26 |
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version |
| 27 |
+dnl |
| 28 |
+AC_DEFUN([APU_CHECK_DB52], [ |
| 29 |
+ places=$1 |
| 30 |
+ if test -z "$places"; then |
| 31 |
+ places="std /usr/local/BerkeleyDB.5.2 /boot/home/config" |
| 32 |
+ fi |
| 33 |
+ APU_CHECK_BERKELEY_DB("5", "2", "-1", |
| 34 |
+ "$places", |
| 35 |
+ "db52/db.h db5/db.h db.h", |
| 36 |
+ "db-5.2 db5-5.2 db52 db5 db" |
| 37 |
+ ) |
| 38 |
+ if test "$apu_have_db" = "1"; then |
| 39 |
+ apu_db_version=5 |
| 40 |
+ fi |
| 41 |
+]) |
| 42 |
|
| 43 |
AC_DEFUN([APU_CHECK_DB], [ |
| 44 |
requested=$1 |
| 45 |
@@ -681,6 +700,12 @@ |
| 46 |
AC_MSG_ERROR(Berkeley db5 not found) |
| 47 |
fi |
| 48 |
;; |
| 49 |
+ db52) |
| 50 |
+ APU_CHECK_DB52("$check_places") |
| 51 |
+ if test "$apu_db_version" != "5"; then |
| 52 |
+ AC_MSG_ERROR(Berkeley db5 not found) |
| 53 |
+ fi |
| 54 |
+ ;; |
| 55 |
default) |
| 56 |
APU_CHECK_DB_ALL("$check_places") |
| 57 |
;; |
| 58 |
@@ -688,40 +713,43 @@ |
| 59 |
]) |
| 60 |
|
| 61 |
dnl |
| 62 |
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1. |
| 63 |
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.2 to 1. |
| 64 |
dnl |
| 65 |
AC_DEFUN([APU_CHECK_DB_ALL], [ |
| 66 |
all_places=$1 |
| 67 |
|
| 68 |
- APU_CHECK_DB51("$all_places") |
| 69 |
+ APU_CHECK_DB52("$all_places") |
| 70 |
if test "$apu_db_version" != "5"; then |
| 71 |
- APU_CHECK_DB50("$all_places") |
| 72 |
+ APU_CHECK_DB51("$all_places") |
| 73 |
if test "$apu_db_version" != "5"; then |
| 74 |
- APU_CHECK_DB48("$all_places") |
| 75 |
- if test "$apu_db_version" != "4"; then |
| 76 |
- APU_CHECK_DB47("$all_places") |
| 77 |
+ APU_CHECK_DB50("$all_places") |
| 78 |
+ if test "$apu_db_version" != "5"; then |
| 79 |
+ APU_CHECK_DB48("$all_places") |
| 80 |
if test "$apu_db_version" != "4"; then |
| 81 |
- APU_CHECK_DB46("$all_places") |
| 82 |
+ APU_CHECK_DB47("$all_places") |
| 83 |
if test "$apu_db_version" != "4"; then |
| 84 |
- APU_CHECK_DB45("$all_places") |
| 85 |
+ APU_CHECK_DB46("$all_places") |
| 86 |
if test "$apu_db_version" != "4"; then |
| 87 |
- APU_CHECK_DB44("$all_places") |
| 88 |
+ APU_CHECK_DB45("$all_places") |
| 89 |
if test "$apu_db_version" != "4"; then |
| 90 |
- APU_CHECK_DB43("$all_places") |
| 91 |
+ APU_CHECK_DB44("$all_places") |
| 92 |
if test "$apu_db_version" != "4"; then |
| 93 |
- APU_CHECK_DB42("$all_places") |
| 94 |
+ APU_CHECK_DB43("$all_places") |
| 95 |
if test "$apu_db_version" != "4"; then |
| 96 |
- APU_CHECK_DB41("$all_places") |
| 97 |
+ APU_CHECK_DB42("$all_places") |
| 98 |
if test "$apu_db_version" != "4"; then |
| 99 |
- APU_CHECK_DB4("$all_places") |
| 100 |
+ APU_CHECK_DB41("$all_places") |
| 101 |
if test "$apu_db_version" != "4"; then |
| 102 |
- APU_CHECK_DB3("$all_places") |
| 103 |
- if test "$apu_db_version" != "3"; then |
| 104 |
- APU_CHECK_DB2("$all_places") |
| 105 |
- if test "$apu_db_version" != "2"; then |
| 106 |
- APU_CHECK_DB1("$all_places") |
| 107 |
- if test "$apu_db_version" != "1"; then |
| 108 |
- APU_CHECK_DB185("$all_places") |
| 109 |
+ APU_CHECK_DB4("$all_places") |
| 110 |
+ if test "$apu_db_version" != "4"; then |
| 111 |
+ APU_CHECK_DB3("$all_places") |
| 112 |
+ if test "$apu_db_version" != "3"; then |
| 113 |
+ APU_CHECK_DB2("$all_places") |
| 114 |
+ if test "$apu_db_version" != "2"; then |
| 115 |
+ APU_CHECK_DB1("$all_places") |
| 116 |
+ if test "$apu_db_version" != "1"; then |
| 117 |
+ APU_CHECK_DB185("$all_places") |
| 118 |
+ fi |
| 119 |
fi |
| 120 |
fi |
| 121 |
fi |
| 122 |
@@ -763,11 +791,11 @@ |
| 123 |
apu_db_version=0 |
| 124 |
|
| 125 |
AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. |
| 126 |
- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])], |
| 127 |
+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51,db52}])], |
| 128 |
[ |
| 129 |
if test "$withval" = "yes"; then |
| 130 |
AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. |
| 131 |
- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) |
| 132 |
+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52]) |
| 133 |
fi |
| 134 |
requested="$withval" |
| 135 |
], [ |
| 136 |
@@ -978,6 +1006,10 @@ |
| 137 |
apu_use_db=1 |
| 138 |
apu_default_dbm=db5 |
| 139 |
;; |
| 140 |
+ db52) |
| 141 |
+ apu_use_db=1 |
| 142 |
+ apu_default_dbm=db5 |
| 143 |
+ ;; |
| 144 |
default) |
| 145 |
dnl ### use more sophisticated DBMs for the default? |
| 146 |
apu_default_dbm="sdbm (default)" |
| 147 |
@@ -985,7 +1017,7 @@ |
| 148 |
;; |
| 149 |
*) |
| 150 |
AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. |
| 151 |
- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) |
| 152 |
+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52]) |
| 153 |
;; |
| 154 |
esac |
Archives