diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-03-22 18:32:16 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-03-22 18:32:16 +0000 |
| commit | a76caf98894c521cf0c0fee41820833eb4a50e1c (patch) | |
| tree | 19825603781b599f4492e811c5e042e46d5d7897 /dev-util | |
| parent | Stable on alpha, bug #252430 (diff) | |
| download | gentoo-2-a76caf98894c521cf0c0fee41820833eb4a50e1c.tar.gz gentoo-2-a76caf98894c521cf0c0fee41820833eb4a50e1c.tar.bz2 gentoo-2-a76caf98894c521cf0c0fee41820833eb4a50e1c.zip | |
Don't print messages related to Berkeley DB when USE="-berkdb".
(Portage version: 13142-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/subversion/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-1.6.0.ebuild | 30 |
2 files changed, 21 insertions, 15 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index e937ce9095f6..4ceed46b5e2e 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/subversion # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.353 2009/03/22 14:40:03 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.354 2009/03/22 18:32:16 arfrever Exp $ + + 22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + subversion-1.6.0.ebuild: + Don't print messages related to Berkeley DB when USE="-berkdb". 22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> subversion-1.6.0.ebuild: diff --git a/dev-util/subversion/subversion-1.6.0.ebuild b/dev-util/subversion/subversion-1.6.0.ebuild index 6a978321a93c..0bb318666426 100644 --- a/dev-util/subversion/subversion-1.6.0.ebuild +++ b/dev-util/subversion/subversion-1.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.2 2009/03/22 14:40:03 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.3 2009/03/22 18:32:16 arfrever Exp $ EAPI="1" @@ -119,20 +119,22 @@ src_compile() { myconf="${myconf} --without-swig" fi - einfo - if [[ -z "${SVN_BDB_VERSION}" ]]; then - SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" - einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." - fi - einfo "Using Berkeley DB ${SVN_BDB_VERSION}" - einfo + if use berkdb; then + einfo + if [[ -z "${SVN_BDB_VERSION}" ]]; then + SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" + einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." + fi + einfo "Using Berkeley DB ${SVN_BDB_VERSION}" + einfo - local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then - eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" - eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." - eerror "Aborting to avoid possible run-time crashes." - die "Berkeley DB version mismatch" + local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then + eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" + eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." + eerror "Aborting to avoid possible run-time crashes." + die "Berkeley DB version mismatch" + fi fi econf --libdir="/usr/$(get_libdir)" \ |