| 1 |
commit: d104dadc8ab39f648dd2fc842a38595f59583b7b |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Aug 18 10:24:25 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 4 15:30:19 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d104dadc |
| 7 |
|
| 8 |
dev-libs/apr-util: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/2220 |
| 11 |
|
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
.../apr-util/files/apr-util-1.3.12-bdb-5.2.patch | 139 --------------------- |
| 15 |
1 file changed, 139 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch b/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 5687a8e..00000000 |
| 20 |
--- a/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,139 +0,0 @@ |
| 23 |
---- build/dbm.m4 |
| 24 |
-+++ build/dbm.m4 |
| 25 |
-@@ -579,6 +579,25 @@ |
| 26 |
- apu_db_version=5 |
| 27 |
- fi |
| 28 |
- ]) |
| 29 |
-+dnl |
| 30 |
-+dnl APU_CHECK_DB52: is DB5.2 present? |
| 31 |
-+dnl |
| 32 |
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version |
| 33 |
-+dnl |
| 34 |
-+AC_DEFUN([APU_CHECK_DB52], [ |
| 35 |
-+ places=$1 |
| 36 |
-+ if test -z "$places"; then |
| 37 |
-+ places="std /usr/local/BerkeleyDB.5.2 /boot/home/config" |
| 38 |
-+ fi |
| 39 |
-+ APU_CHECK_BERKELEY_DB("5", "2", "-1", |
| 40 |
-+ "$places", |
| 41 |
-+ "db52/db.h db5/db.h db.h", |
| 42 |
-+ "db-5.2 db5-5.2 db52 db5 db" |
| 43 |
-+ ) |
| 44 |
-+ if test "$apu_have_db" = "1"; then |
| 45 |
-+ apu_db_version=5 |
| 46 |
-+ fi |
| 47 |
-+]) |
| 48 |
- |
| 49 |
- AC_DEFUN([APU_CHECK_DB], [ |
| 50 |
- requested=$1 |
| 51 |
-@@ -681,6 +700,12 @@ |
| 52 |
- AC_MSG_ERROR(Berkeley db5 not found) |
| 53 |
- fi |
| 54 |
- ;; |
| 55 |
-+ db52) |
| 56 |
-+ APU_CHECK_DB52("$check_places") |
| 57 |
-+ if test "$apu_db_version" != "5"; then |
| 58 |
-+ AC_MSG_ERROR(Berkeley db5 not found) |
| 59 |
-+ fi |
| 60 |
-+ ;; |
| 61 |
- default) |
| 62 |
- APU_CHECK_DB_ALL("$check_places") |
| 63 |
- ;; |
| 64 |
-@@ -688,40 +713,43 @@ |
| 65 |
- ]) |
| 66 |
- |
| 67 |
- dnl |
| 68 |
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1. |
| 69 |
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.2 to 1. |
| 70 |
- dnl |
| 71 |
- AC_DEFUN([APU_CHECK_DB_ALL], [ |
| 72 |
- all_places=$1 |
| 73 |
- |
| 74 |
-- APU_CHECK_DB51("$all_places") |
| 75 |
-+ APU_CHECK_DB52("$all_places") |
| 76 |
- if test "$apu_db_version" != "5"; then |
| 77 |
-- APU_CHECK_DB50("$all_places") |
| 78 |
-+ APU_CHECK_DB51("$all_places") |
| 79 |
- if test "$apu_db_version" != "5"; then |
| 80 |
-- APU_CHECK_DB48("$all_places") |
| 81 |
-- if test "$apu_db_version" != "4"; then |
| 82 |
-- APU_CHECK_DB47("$all_places") |
| 83 |
-+ APU_CHECK_DB50("$all_places") |
| 84 |
-+ if test "$apu_db_version" != "5"; then |
| 85 |
-+ APU_CHECK_DB48("$all_places") |
| 86 |
- if test "$apu_db_version" != "4"; then |
| 87 |
-- APU_CHECK_DB46("$all_places") |
| 88 |
-+ APU_CHECK_DB47("$all_places") |
| 89 |
- if test "$apu_db_version" != "4"; then |
| 90 |
-- APU_CHECK_DB45("$all_places") |
| 91 |
-+ APU_CHECK_DB46("$all_places") |
| 92 |
- if test "$apu_db_version" != "4"; then |
| 93 |
-- APU_CHECK_DB44("$all_places") |
| 94 |
-+ APU_CHECK_DB45("$all_places") |
| 95 |
- if test "$apu_db_version" != "4"; then |
| 96 |
-- APU_CHECK_DB43("$all_places") |
| 97 |
-+ APU_CHECK_DB44("$all_places") |
| 98 |
- if test "$apu_db_version" != "4"; then |
| 99 |
-- APU_CHECK_DB42("$all_places") |
| 100 |
-+ APU_CHECK_DB43("$all_places") |
| 101 |
- if test "$apu_db_version" != "4"; then |
| 102 |
-- APU_CHECK_DB41("$all_places") |
| 103 |
-+ APU_CHECK_DB42("$all_places") |
| 104 |
- if test "$apu_db_version" != "4"; then |
| 105 |
-- APU_CHECK_DB4("$all_places") |
| 106 |
-+ APU_CHECK_DB41("$all_places") |
| 107 |
- if test "$apu_db_version" != "4"; then |
| 108 |
-- APU_CHECK_DB3("$all_places") |
| 109 |
-- if test "$apu_db_version" != "3"; then |
| 110 |
-- APU_CHECK_DB2("$all_places") |
| 111 |
-- if test "$apu_db_version" != "2"; then |
| 112 |
-- APU_CHECK_DB1("$all_places") |
| 113 |
-- if test "$apu_db_version" != "1"; then |
| 114 |
-- APU_CHECK_DB185("$all_places") |
| 115 |
-+ APU_CHECK_DB4("$all_places") |
| 116 |
-+ if test "$apu_db_version" != "4"; then |
| 117 |
-+ APU_CHECK_DB3("$all_places") |
| 118 |
-+ if test "$apu_db_version" != "3"; then |
| 119 |
-+ APU_CHECK_DB2("$all_places") |
| 120 |
-+ if test "$apu_db_version" != "2"; then |
| 121 |
-+ APU_CHECK_DB1("$all_places") |
| 122 |
-+ if test "$apu_db_version" != "1"; then |
| 123 |
-+ APU_CHECK_DB185("$all_places") |
| 124 |
-+ fi |
| 125 |
- fi |
| 126 |
- fi |
| 127 |
- fi |
| 128 |
-@@ -763,11 +791,11 @@ |
| 129 |
- apu_db_version=0 |
| 130 |
- |
| 131 |
- AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. |
| 132 |
-- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])], |
| 133 |
-+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51,db52}])], |
| 134 |
- [ |
| 135 |
- if test "$withval" = "yes"; then |
| 136 |
- AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. |
| 137 |
-- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) |
| 138 |
-+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52]) |
| 139 |
- fi |
| 140 |
- requested="$withval" |
| 141 |
- ], [ |
| 142 |
-@@ -978,6 +1006,10 @@ |
| 143 |
- apu_use_db=1 |
| 144 |
- apu_default_dbm=db5 |
| 145 |
- ;; |
| 146 |
-+ db52) |
| 147 |
-+ apu_use_db=1 |
| 148 |
-+ apu_default_dbm=db5 |
| 149 |
-+ ;; |
| 150 |
- default) |
| 151 |
- dnl ### use more sophisticated DBMs for the default? |
| 152 |
- apu_default_dbm="sdbm (default)" |
| 153 |
-@@ -985,7 +1017,7 @@ |
| 154 |
- ;; |
| 155 |
- *) |
| 156 |
- AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. |
| 157 |
-- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) |
| 158 |
-+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52]) |
| 159 |
- ;; |
| 160 |
- esac |
| 161 |
- |
Archives