summaryrefslogtreecommitdiffstats
path: root/collab/subversion/BUILD
diff options
context:
space:
mode:
Diffstat (limited to 'collab/subversion/BUILD')
-rwxr-xr-xcollab/subversion/BUILD10
1 files changed, 7 insertions, 3 deletions
diff --git a/collab/subversion/BUILD b/collab/subversion/BUILD
index 7105bf944e..b9276648f0 100755
--- a/collab/subversion/BUILD
+++ b/collab/subversion/BUILD
@@ -1,3 +1,7 @@
+# -ggdb conflicts with --disable-debug OPT
+ CFLAGS=${CFLAGS/-ggdb/}
+CPPFLAGS=${CPPFLAGS/-ggdb/}
+CXXFLAGS=${CXXFLAGS/-ggdb/}
# only check for Apache if the modules are needed
if echo $OPTS | grep -q 'with-apxs'; then
message "${MESSAGE_COLOR}Checking for Apache 2.x${DEFAULT_COLOR}" &&
@@ -19,14 +23,14 @@ if ! [[ -x configure ]]; then ./autogen.sh; fi &&
if [[ "$(get_spell_provider $SPELL APR)" == "apr" ]] || \
[[ "$(get_spell_provider $SPELL APU)" == "apr-util" ]]; then
CFLAGS="${CFLAGS} $(/usr/bin/apr-1-config --cppflags)" &&
- OPTS="${OPTS} --disable-debug --disable-static --disable-mod-activation --enable-dso --enable-shared --disable-experimental-libtool"
+ OPTS="${OPTS} --disable-debug --disable-static --disable-mod-activation --enable-shared --disable-experimental-libtool"
else
- OPTS="${OPTS} --disable-debug --disable-static --disable-mod-activation --enable-dso --enable-shared --disable-neon-version-check"
+ OPTS="${OPTS} --disable-debug --disable-static --disable-mod-activation --enable-shared --disable-neon-version-check"
fi &&
SWIG_LDFLAGS="${LDFLAGS}" &&
make_single &&
-default_build &&
+OPTS="--enable-runtime-module-search $OPTS" default_build &&
if [[ "$SVN_PERL" == y ]]; then
mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc} &&