|
Line
Link Here
|
| 0 |
-- dev-util/subversion/subversion-1.6.0.ebuild |
0 |
++ dev-util/subversion/subversion-1.6.0.ebuild |
|
Lines 75-80
Link Here
|
| 75 |
ewarn |
75 |
ewarn |
| 76 |
ebeep |
76 |
ebeep |
| 77 |
fi |
77 |
fi |
|
|
78 |
|
| 79 |
append-flags -fno-strict-aliasing |
| 80 |
|
| 81 |
if use debug; then |
| 82 |
append-cppflags -DSVN_DEBUG -DAP_DEBUG |
| 83 |
fi |
| 78 |
} |
84 |
} |
| 79 |
|
85 |
|
| 80 |
src_unpack() { |
86 |
src_unpack() { |
|
Lines 89-94
Link Here
|
| 89 |
# Fix 2 messages in Polish translation. They will be fixed in 1.6.1. |
95 |
# Fix 2 messages in Polish translation. They will be fixed in 1.6.1. |
| 90 |
sed -e "7420d;8586d" -i subversion/po/pl.po |
96 |
sed -e "7420d;8586d" -i subversion/po/pl.po |
| 91 |
|
97 |
|
|
|
98 |
# https://svn.collab.net/viewvc/svn?view=revision&revision=36742 |
| 99 |
sed -e 's/$SVN_APRUTIL_INCLUDES $SVN_DB_INCLUDES/$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES/' -i build/ac-macros/berkeley-db.m4 |
| 100 |
|
| 92 |
sed -i \ |
101 |
sed -i \ |
| 93 |
-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ |
102 |
-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ |
| 94 |
-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac |
103 |
-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac |
|
Lines 110-125
Link Here
|
| 110 |
myconf="${myconf} --without-swig" |
119 |
myconf="${myconf} --without-swig" |
| 111 |
fi |
120 |
fi |
| 112 |
|
121 |
|
| 113 |
if use debug; then |
122 |
einfo |
| 114 |
append-cppflags -DSVN_DEBUG -DAP_DEBUG |
123 |
if [[ -z "${SVN_BDB_VERSION}" ]]; then |
|
|
124 |
SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" |
| 125 |
einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." |
| 115 |
fi |
126 |
fi |
|
|
127 |
einfo "Using Berkeley DB ${SVN_BDB_VERSION}" |
| 128 |
einfo |
| 116 |
|
129 |
|
| 117 |
append-flags -fno-strict-aliasing |
130 |
apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" |
|
|
131 |
if [[ -n "${apu_bdb_version}" ]]; then |
| 132 |
if [[ "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then |
| 133 |
eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" |
| 134 |
eerror" to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." |
| 135 |
eerror "Aborting to avoid possible run-time crashes." |
| 136 |
die "Berkeley DB version mismatch" |
| 137 |
fi |
| 138 |
fi |
| 118 |
|
139 |
|
| 119 |
econf --libdir="/usr/$(get_libdir)" \ |
140 |
econf --libdir="/usr/$(get_libdir)" \ |
| 120 |
${myconf} \ |
141 |
${myconf} \ |
| 121 |
$(use_with apache2 apxs "${APXS}") \ |
142 |
$(use_with apache2 apxs "${APXS}") \ |
| 122 |
$(use_with berkdb berkeley-db "db.h:$(db_includedir 2>/dev/null)::$(db_libname 2>/dev/null)") \ |
143 |
$(use_with berkdb berkeley-db "db.h:/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \ |
| 123 |
$(use_with ctypes-python ctypesgen /usr) \ |
144 |
$(use_with ctypes-python ctypesgen /usr) \ |
| 124 |
$(use_enable dso runtime-module-search) \ |
145 |
$(use_enable dso runtime-module-search) \ |
| 125 |
$(use_with gnome-keyring) \ |
146 |
$(use_with gnome-keyring) \ |
