[Pkg-apache-commits] r1299 - in /trunk/apr-util: changelog control patches/00list patches/016_bdb5.1.dpatch rules
sf at alioth.debian.org
sf at alioth.debian.org
Fri Apr 8 17:09:10 UTC 2011
Author: sf
Date: Fri Apr 8 17:09:02 2011
New Revision: 1299
URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1299
Log:
- build-depend on libdb-dev instead of libdb4.8-dev
- add configure support for libdb 5.1
Added:
trunk/apr-util/patches/016_bdb5.1.dpatch
Modified:
trunk/apr-util/changelog
trunk/apr-util/control
trunk/apr-util/patches/00list
trunk/apr-util/rules
Modified: trunk/apr-util/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/changelog?rev=1299&op=diff
==============================================================================
--- trunk/apr-util/changelog (original)
+++ trunk/apr-util/changelog Fri Apr 8 17:09:02 2011
@@ -3,6 +3,11 @@
* Remove libdb4.8-dev dependency in libaprutil1-dev. This allows packages
build-depending on apr-util1 to use a different version of db than
apr-util.
+ * With the libdb build-dependency decoupled from subversion, we can now
+ build-depend on libdb-dev instead of libdb4.8-dev. Users of APU_WANT_DB
+ in apu_want.h would have to depend on libdb-dev explicitly, but there
+ are none outside of apr-util itself. Closes: #621366
+ * Add configure support for libdb 5.1.
-- Stefan Fritsch <sf at debian.org> Thu, 07 Apr 2011 19:14:07 +0200
Modified: trunk/apr-util/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/control?rev=1299&op=diff
==============================================================================
--- trunk/apr-util/control (original)
+++ trunk/apr-util/control Fri Apr 8 17:09:02 2011
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
Uploaders: Tollef Fog Heen <tfheen at debian.org>, Stefan Fritsch <sf at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>, Peter Samuelson <peter at p12n.org>
-Build-Depends: debhelper (>> 6.0.7~), autoconf, autotools-dev, mawk, libldap2-dev, libexpat1-dev, libdb4.8-dev, libpcre3-dev, dpatch (>= 1.11), binutils (>= 2.14.90.0.7), libapr1-dev (>= 1.3.2), libsqlite3-dev, libpq-dev, python, libmysqlclient-dev, freetds-dev, unixodbc-dev, doxygen
+Build-Depends: debhelper (>> 6.0.7~), autoconf, autotools-dev, mawk, libldap2-dev, libexpat1-dev, libdb-dev, libpcre3-dev, dpatch (>= 1.11), binutils (>= 2.14.90.0.7), libapr1-dev (>= 1.3.2), libsqlite3-dev, libpq-dev, python, libmysqlclient-dev, freetds-dev, unixodbc-dev, doxygen
Standards-Version: 3.9.1
Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util
Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apr-util
Modified: trunk/apr-util/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/patches/00list?rev=1299&op=diff
==============================================================================
--- trunk/apr-util/patches/00list (original)
+++ trunk/apr-util/patches/00list Fri Apr 8 17:09:02 2011
@@ -7,4 +7,5 @@
013_ship_find_apu.m4
014_apu_config_dont_list_indep_libs
015_disable_expat_buildconf.dpatch
+016_bdb5.1.dpatch
099_alternate_md4_md5_impl
Added: trunk/apr-util/patches/016_bdb5.1.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/patches/016_bdb5.1.dpatch?rev=1299&op=file
==============================================================================
--- trunk/apr-util/patches/016_bdb5.1.dpatch (added)
+++ trunk/apr-util/patches/016_bdb5.1.dpatch Fri Apr 8 17:09:02 2011
@@ -1,0 +1,150 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+ at DPATCH@
+
+commit fbda7d702df7b50f7f8e4bc1c6de271c9972da5c
+Author: Rainer Jung <rjung at apache.org>
+Date: Sat Oct 2 12:36:37 2010 +0000
+
+ Add support for Berkeley DB 5.1.
+
+
+ git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x@1003788 13f79535-47bb-0310-9956-ffa450edef68
+
+diff --git a/build/dbm.m4 b/build/dbm.m4
+index 0700684..1b229f4 100644
+--- a/build/dbm.m4
++++ b/build/dbm.m4
+@@ -560,6 +560,25 @@ AC_DEFUN([APU_CHECK_DB50], [
+ apu_db_version=5
+ fi
+ ])
++dnl
++dnl APU_CHECK_DB51: is DB5.1 present?
++dnl
++dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
++dnl
++AC_DEFUN([APU_CHECK_DB51], [
++ places=$1
++ if test -z "$places"; then
++ places="std /usr/local/BerkeleyDB.5.1 /boot/home/config"
++ fi
++ APU_CHECK_BERKELEY_DB("5", "1", "-1",
++ "$places",
++ "db51/db.h db5/db.h db.h",
++ "db-5.1 db5-5.1 db51 db5 db"
++ )
++ if test "$apu_have_db" = "1"; then
++ apu_db_version=5
++ fi
++])
+
+ AC_DEFUN([APU_CHECK_DB], [
+ requested=$1
+@@ -656,6 +675,12 @@ AC_DEFUN([APU_CHECK_DB], [
+ AC_MSG_ERROR(Berkeley db5 not found)
+ fi
+ ;;
++ db51)
++ APU_CHECK_DB51("$check_places")
++ if test "$apu_db_version" != "5"; then
++ AC_MSG_ERROR(Berkeley db5 not found)
++ fi
++ ;;
+ default)
+ APU_CHECK_DB_ALL("$check_places")
+ ;;
+@@ -663,38 +688,41 @@ AC_DEFUN([APU_CHECK_DB], [
+ ])
+
+ dnl
+-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.0 to 1.
++dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1.
+ dnl
+ AC_DEFUN([APU_CHECK_DB_ALL], [
+ all_places=$1
+
+- APU_CHECK_DB50("$all_places")
++ APU_CHECK_DB51("$all_places")
+ if test "$apu_db_version" != "5"; then
+- APU_CHECK_DB48("$all_places")
+- if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB47("$all_places")
++ APU_CHECK_DB50("$all_places")
++ if test "$apu_db_version" != "5"; then
++ APU_CHECK_DB48("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB46("$all_places")
++ APU_CHECK_DB47("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB45("$all_places")
++ APU_CHECK_DB46("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB44("$all_places")
++ APU_CHECK_DB45("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB43("$all_places")
++ APU_CHECK_DB44("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB42("$all_places")
++ APU_CHECK_DB43("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB41("$all_places")
++ APU_CHECK_DB42("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB4("$all_places")
++ APU_CHECK_DB41("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB3("$all_places")
+- if test "$apu_db_version" != "3"; then
+- APU_CHECK_DB2("$all_places")
+- if test "$apu_db_version" != "2"; then
+- APU_CHECK_DB1("$all_places")
+- if test "$apu_db_version" != "1"; then
+- APU_CHECK_DB185("$all_places")
++ APU_CHECK_DB4("$all_places")
++ if test "$apu_db_version" != "4"; then
++ APU_CHECK_DB3("$all_places")
++ if test "$apu_db_version" != "3"; then
++ APU_CHECK_DB2("$all_places")
++ if test "$apu_db_version" != "2"; then
++ APU_CHECK_DB1("$all_places")
++ if test "$apu_db_version" != "1"; then
++ APU_CHECK_DB185("$all_places")
++ fi
+ fi
+ fi
+ fi
+@@ -735,11 +763,11 @@ AC_DEFUN([APU_CHECK_DBM], [
+ apu_db_version=0
+
+ AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
+- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])],
++ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])],
+ [
+ if test "$withval" = "yes"; then
+ AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
+- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
++ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51])
+ fi
+ requested="$withval"
+ ], [
+@@ -946,6 +974,10 @@ AC_DEFUN([APU_CHECK_DBM], [
+ apu_use_db=1
+ apu_default_dbm=db5
+ ;;
++ db51)
++ apu_use_db=1
++ apu_default_dbm=db5
++ ;;
+ default)
+ dnl ### use more sophisticated DBMs for the default?
+ apu_default_dbm="sdbm (default)"
+@@ -953,7 +985,7 @@ AC_DEFUN([APU_CHECK_DBM], [
+ ;;
+ *)
+ AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
+- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
++ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51])
+ ;;
+ esac
+
Modified: trunk/apr-util/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/rules?rev=1299&op=diff
==============================================================================
--- trunk/apr-util/rules (original)
+++ trunk/apr-util/rules Fri Apr 8 17:09:02 2011
@@ -61,7 +61,7 @@
config.status: configure.in patch-stamp
dh_testdir
./buildconf --with-apr=$(shell apr-1-config --srcdir)
- $(CONFFLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --with-apr=/usr/bin/apr-1-config --with-ldap=yes --with-dbm=db46 --with-sqlite3 --with-pgsql=/usr --without-gdbm --without-sqlite2 --with-berkeley-db --with-mysql=/usr --with-freetds=/usr --with-odbc=/usr
+ $(CONFFLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --with-apr=/usr/bin/apr-1-config --with-ldap=yes --with-dbm=db --with-sqlite3 --with-pgsql=/usr --without-gdbm --without-sqlite2 --with-berkeley-db --with-mysql=/usr --with-freetds=/usr --with-odbc=/usr
build: patch-stamp build-stamp
More information about the Pkg-apache-commits
mailing list