| 1 |
arfrever 09/03/22 14:40:03 |
| 2 |
|
| 3 |
Modified: ChangeLog subversion-1.6.0.ebuild |
| 4 |
Log: |
| 5 |
Fix detection of Berkeley DB (bug #263347). |
| 6 |
(Portage version: 13142-svn/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.353 dev-util/subversion/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.353&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.353&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?r1=1.352&r2=1.353 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v |
| 18 |
retrieving revision 1.352 |
| 19 |
retrieving revision 1.353 |
| 20 |
diff -u -r1.352 -r1.353 |
| 21 |
--- ChangeLog 22 Mar 2009 02:07:57 -0000 1.352 |
| 22 |
+++ ChangeLog 22 Mar 2009 14:40:03 -0000 1.353 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-util/subversion |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.352 2009/03/22 02:07:57 arfrever Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.353 2009/03/22 14:40:03 arfrever Exp $ |
| 28 |
+ |
| 29 |
+ 22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 30 |
+ subversion-1.6.0.ebuild: |
| 31 |
+ Fix detection of Berkeley DB (bug #263347). |
| 32 |
|
| 33 |
*subversion-1.6.0 (22 Mar 2009) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 dev-util/subversion/subversion-1.6.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: subversion-1.6.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- subversion-1.6.0.ebuild 22 Mar 2009 02:07:57 -0000 1.1 |
| 51 |
+++ subversion-1.6.0.ebuild 22 Mar 2009 14:40:03 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.1 2009/03/22 02:07:57 arfrever Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.2 2009/03/22 14:40:03 arfrever Exp $ |
| 57 |
|
| 58 |
EAPI="1" |
| 59 |
|
| 60 |
@@ -75,6 +75,12 @@ |
| 61 |
ewarn |
| 62 |
ebeep |
| 63 |
fi |
| 64 |
+ |
| 65 |
+ append-flags -fno-strict-aliasing |
| 66 |
+ |
| 67 |
+ if use debug; then |
| 68 |
+ append-cppflags -DSVN_DEBUG -DAP_DEBUG |
| 69 |
+ fi |
| 70 |
} |
| 71 |
|
| 72 |
src_unpack() { |
| 73 |
@@ -89,6 +95,9 @@ |
| 74 |
# Fix 2 messages in Polish translation. They will be fixed in 1.6.1. |
| 75 |
sed -e "7420d;8586d" -i subversion/po/pl.po |
| 76 |
|
| 77 |
+ # https://svn.collab.net/viewvc/svn?view=revision&revision=36742 |
| 78 |
+ sed -e 's/$SVN_APRUTIL_INCLUDES $SVN_DB_INCLUDES/$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES/' -i build/ac-macros/berkeley-db.m4 |
| 79 |
+ |
| 80 |
sed -i \ |
| 81 |
-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ |
| 82 |
-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac |
| 83 |
@@ -110,16 +119,26 @@ |
| 84 |
myconf="${myconf} --without-swig" |
| 85 |
fi |
| 86 |
|
| 87 |
- if use debug; then |
| 88 |
- append-cppflags -DSVN_DEBUG -DAP_DEBUG |
| 89 |
+ einfo |
| 90 |
+ if [[ -z "${SVN_BDB_VERSION}" ]]; then |
| 91 |
+ SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" |
| 92 |
+ einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." |
| 93 |
fi |
| 94 |
+ einfo "Using Berkeley DB ${SVN_BDB_VERSION}" |
| 95 |
+ einfo |
| 96 |
|
| 97 |
- append-flags -fno-strict-aliasing |
| 98 |
+ local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" |
| 99 |
+ if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then |
| 100 |
+ eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" |
| 101 |
+ eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." |
| 102 |
+ eerror "Aborting to avoid possible run-time crashes." |
| 103 |
+ die "Berkeley DB version mismatch" |
| 104 |
+ fi |
| 105 |
|
| 106 |
econf --libdir="/usr/$(get_libdir)" \ |
| 107 |
${myconf} \ |
| 108 |
$(use_with apache2 apxs "${APXS}") \ |
| 109 |
- $(use_with berkdb berkeley-db "db.h:$(db_includedir 2>/dev/null)::$(db_libname 2>/dev/null)") \ |
| 110 |
+ $(use_with berkdb berkeley-db "db.h:/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \ |
| 111 |
$(use_with ctypes-python ctypesgen /usr) \ |
| 112 |
$(use_enable dso runtime-module-search) \ |
| 113 |
$(use_with gnome-keyring) \ |
Archives