Date: Thu, 22 Jul 2010 00:42:05 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@freebsd.org Cc: apache@FreeBSD.org Subject: [PATCH] devel/apr1: fix build with databases/db50 (WITH_BDB_VER=50) Message-ID: <20100721164205.778672AEC49A@sunpoet.net>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users >Originator: Sunpoet Po-Chuan Hsieh >Organization: SUNPOET.net >Confidential: no >Synopsis: [PATCH] devel/apr1: fix build with databases/db50 (WITH_BDB_VER=50) >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 8.1-PRERELEASE amd64 >Environment: System: FreeBSD bonjour.sunpoet.net 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Sun Jun 20 12:49:47 CST 2010 >Description: Though devel/apr1/files/patch-bdb5 provides db50 detection during configure phase, user who is willing to use db50 may still get build failures. In apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c, DB_VERSION_MAJOR for db50 is not properly handled. Thus, it has been recognized as 1.x. Added file(s): - files/patch-apr-util-1.3.9-dbm-apr_dbm_berkeleydb.c Port maintainer (apache@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- apr-1.4.2.1.3.9_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/apr1/files/patch-apr-util-1.3.9-dbm-apr_dbm_berkeleydb.c /usr/ports/sunpoet/apr1/files/patch-apr-util-1.3.9-dbm-apr_dbm_berkeleydb.c --- /usr/ports/devel/apr1/files/patch-apr-util-1.3.9-dbm-apr_dbm_berkeleydb.c 1970-01-01 08:00:00.000000000 +0800 +++ /usr/ports/sunpoet/apr1/files/patch-apr-util-1.3.9-dbm-apr_dbm_berkeleydb.c 2010-07-21 16:20:48.000000000 +0800 @@ -0,0 +1,22 @@ +--- apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c.orig 2008-11-21 16:22:35.000000000 +0800 ++++ apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c 2010-07-21 16:20:02.000000000 +0800 +@@ -37,7 +37,9 @@ + * DB_185, DB2, DB3, and DB4. + */ + +-#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4) ++#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 5) ++#define DB_VER 5 ++#elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4) + /* We will treat anything greater than 4.1 as DB4. + * We can treat 4.0 as DB3. + */ +@@ -166,7 +168,7 @@ + #if DB_VER >= 3 + if ((dberr = db_create(&file.bdb, NULL, 0)) == 0) { + if ((dberr = (*file.bdb->open)(file.bdb, +-#if DB_VER == 4 ++#if DB_VER == 4 || DB_VER == 5 + NULL, + #endif + pathname, NULL, --- apr-1.4.2.1.3.9_1.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100721164205.778672AEC49A>