summaryrefslogtreecommitdiffstats
path: root/collab/subversion/PRE_BUILD
diff options
context:
space:
mode:
Diffstat (limited to 'collab/subversion/PRE_BUILD')
-rwxr-xr-xcollab/subversion/PRE_BUILD22
1 files changed, 3 insertions, 19 deletions
diff --git a/collab/subversion/PRE_BUILD b/collab/subversion/PRE_BUILD
index ce00709e11..862a3de2b3 100755
--- a/collab/subversion/PRE_BUILD
+++ b/collab/subversion/PRE_BUILD
@@ -1,21 +1,5 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
-# assure we don't use the included libs by accident
-rm -Rf neon apr apr-util &&
-
-if [[ "$(get_spell_provider $SPELL APR)" == "apr" ]] || \
- [[ "$(get_spell_provider $SPELL APU)" == "apr-util" ]]; then
- message "${MESSAGE_COLOR}Configuring ${SPELL} for APR/APR-UTIL 1.x...${DEFAULT_COLOR}" &&
-
- # this is one of the lovely fixes for building perl with apr 1.x
- patch -p1 < ${SPELL_DIRECTORY}/subversion-apr_cppflags.patch &&
-
- sedit "s:apr-config:apr-1-config:g" build/ac-macros/{find_,}ap* &&
- sedit "s:apu-config:apu-1-config:g" build/ac-macros/{find_,}ap* &&
- sedit 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in &&
- sedit 's/\(NEON_ALLOWED_LIST=.* 0.26.4\)"/\1 0.27.2 0.28.0 0.28.1"/' configure.in &&
-
- autoreconf -v -f &&
- libtoolize -f
-fi
+patch -p1 < "$SPELL_DIRECTORY/neon-1.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/neon-2.patch"