diff options
Diffstat (limited to 'dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch')
| -rw-r--r-- | dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch b/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch new file mode 100644 index 000000000000..158c08233165 --- /dev/null +++ b/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch @@ -0,0 +1,85 @@ +--- subversion-1.8.1/build/ac-macros/berkeley-db.m4 ++++ subversion-1.8.1/build/ac-macros/berkeley-db.m4 +@@ -48,7 +48,7 @@ + AC_ARG_WITH(berkeley-db, [AS_HELP_STRING( + [[--with-berkeley-db[=HEADER:INCLUDES:LIB_SEARCH_DIRS:LIBS]]], [ + The Subversion Berkeley DB based filesystem library +- requires Berkeley DB $db_version or $db_alt_version. If you ++ requires Berkeley DB $db_version or newer. If you + specify `--without-berkeley-db', that library will + not be built. If you omit the argument of this option + completely, the configure script will use Berkeley DB +@@ -126,35 +126,22 @@ + svn_lib_berkeley_db=no + else + AC_MSG_CHECKING([for availability of Berkeley DB]) +- AC_ARG_ENABLE(bdb6, +- AS_HELP_STRING([--enable-bdb6], +- [Allow building against BDB 6+. +- See --with-berkeley-db for specifying the location of +- the Berkeley DB installation. Using BDB 6 will fail if +- this option is not used.]), +- [enable_bdb6=$enableval],[enable_bdb6=unspecified]) +- +- SVN_LIB_BERKELEY_DB_TRY($1, $2, $3, $enable_bdb6) ++ SVN_LIB_BERKELEY_DB_TRY($1, $2, $3) + if test "$svn_have_berkeley_db" = "yes"; then + AC_MSG_RESULT([yes]) + svn_lib_berkeley_db=yes + else +- if test "$svn_have_berkeley_db" = "no6"; then +- AC_MSG_RESULT([no (found version 6, but --enable-bdb6 not specified)]) +- # A warning will be printed at the end of configure.ac. +- else +- AC_MSG_RESULT([no]) +- fi ++ AC_MSG_RESULT([no]) + svn_lib_berkeley_db=no + if test "$bdb_status" = "required"; then +- AC_MSG_ERROR([Berkeley DB $db_version or $db_alt_version wasn't found.]) ++ AC_MSG_ERROR([Berkeley DB $db_version or newer't found.]) + fi + fi + fi + ]) + + +-dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch, enable_bdb6) ++dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch) + dnl + dnl A subroutine of SVN_LIB_BERKELEY_DB. + dnl +@@ -187,7 +174,6 @@ + svn_check_berkeley_db_major=$1 + svn_check_berkeley_db_minor=$2 + svn_check_berkeley_db_patch=$3 +- enable_bdb6=$4 + + if test -z "$SVN_DB_LIBS"; then + # We pass --dbm-libs here since Debian has modified apu-config not +@@ -245,12 +231,6 @@ + || patch != DB_VERSION_PATCH) + exit (1); + +- /* Block Berkeley DB 6, because (a) we haven't tested with it, (b) 6.0.20 +- and newer are under the AGPL, and we want use of AGPL dependencies to be +- opt-in. */ +- if (major >= 6 && strcmp("$enable_bdb6", "yes")) +- exit(2); +- + /* Run-time check: ensure the library claims to be the correct version. */ + + if (major < $svn_check_berkeley_db_major) +@@ -270,11 +250,7 @@ + } + ]])], + [svn_have_berkeley_db=yes], +- [rc=$? +- svn_have_berkeley_db=no +- if test $rc = 2; then +- svn_have_berkeley_db=no6 +- fi], ++ [svn_have_berkeley_db=no], + [svn_have_berkeley_db=yes] + ) + |