[SM-Commit] GIT changes to master grimoire by Elisamuel Resto (64fc6db289e8fa1758b236fef94e36bb6b7f74ca)

Elisamuel Resto scm at sourcemage.org
Wed Apr 16 01:41:02 EDT 2008


GIT changes to master grimoire by Elisamuel Resto <ryuji at sourcemage.org>:

 collab/subversion/BUILD     |   10 ++++++++--
 collab/subversion/HISTORY   |    3 +++
 collab/subversion/PRE_BUILD |   21 +++++++++++++--------
 3 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 64fc6db289e8fa1758b236fef94e36bb6b7f74ca
Author: Elisamuel Resto <ryuji at sourcemage.org>
Commit: Elisamuel Resto <ryuji at sourcemage.org>

    collab/subversion: only apply APR/APU 1.x fixes for APR/APU 1.x (broke APR/APU 0.x)

diff --git a/collab/subversion/BUILD b/collab/subversion/BUILD
index 55ce05b..7105bf9 100755
--- a/collab/subversion/BUILD
+++ b/collab/subversion/BUILD
@@ -16,9 +16,15 @@ fi &&
 
 if ! [[ -x configure ]]; then ./autogen.sh; fi &&
 
-CFLAGS="${CFLAGS} $(/usr/bin/apr-1-config --cppflags)" &&
+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"
+else
+  OPTS="${OPTS} --disable-debug --disable-static --disable-mod-activation --enable-dso --enable-shared --disable-neon-version-check"
+fi &&
+
 SWIG_LDFLAGS="${LDFLAGS}" &&
-OPTS="$OPTS --disable-debug --disable-static --disable-mod-activation --enable-dso --enable-shared --disable-experimental-libtool" &&
 make_single &&
 default_build &&
 
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index f7a2e6c..c9f40ca 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2008-04-16 Elisamuel Resto <ryuji at sourcemage.org>
+	* BUILD, PRE_BUILD: only apply APR/APU 1.x fixes for APR/APU 1.x (broke APR/APU  0.x)
+
 2008-04-06 Elisamuel Resto <ryuji at sourcemage.org>
 	* BUILD, PRE_BUILD: fix for #10735 (Perl SWIG bindings compile failure)
 	* BUILD: woops, was building the code twice
diff --git a/collab/subversion/PRE_BUILD b/collab/subversion/PRE_BUILD
index 734edc4..ce00709 100755
--- a/collab/subversion/PRE_BUILD
+++ b/collab/subversion/PRE_BUILD
@@ -4,13 +4,18 @@ cd $SOURCE_DIRECTORY &&
 # assure we don't use the included libs by accident
 rm -Rf neon apr apr-util &&
 
-# this is one of the lovely fixes for building perl with apr 1.x
-patch -p1 < ${SCRIPT_DIRECTORY}/subversion-apr_cppflags.patch &&
+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}" &&
 
-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 &&
-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* &&
+  # this is one of the lovely fixes for building perl with apr 1.x
+  patch -p1 < ${SPELL_DIRECTORY}/subversion-apr_cppflags.patch &&
 
-autoreconf -v -f &&
-libtoolize -f
+  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



More information about the SM-Commit mailing list