You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/02/28 04:56:20 UTC
svn commit: r1572816 -
/subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh
Author: breser
Date: Fri Feb 28 03:56:20 2014
New Revision: 1572816
URL: http://svn.apache.org/r1572816
Log:
Make the CentOS builbbot use different versions of APR, APR-Util, httpd and
serf with versions newer than 1.9 (aka trunk at current).
* tools/dev/buildbot/slaves/svn-x64-centos/svnbuild.sh: Detect the minor of
the code being built and choose dependencies accordingly.
Modified:
subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh
Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh?rev=1572816&r1=1572815&r2=1572816&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh Fri Feb 28 03:56:20 2014
@@ -25,6 +25,22 @@ set -x
export MAKEFLAGS=-j4
export PYTHON=/usr/local/python25/bin/python
+SVN_VER_MINOR=`awk '/define SVN_VER_MINOR/ { print $3 }' subversion/include/svn_version.h`
+
+if [ $SVN_VER_MINOR -ge 9 ]; then
+ # 1.9 or newer requires APR 1.3.x and Serf 1.3.4
+ # this bubbles out to httpd as well. So use the right dependencies
+ APR=/home/bt/packages/apr-1.3.9-prefix/bin/apr-1-config
+ APU=/home/bt/packages/apr-1.3.9-prefix/bin/apu-1-config
+ APXS=/home/bt/packages/apr-1.3.9-prefix/bin/apxs
+ SERF=/home/bt/packages/apr-1.3.9-prefix
+else
+ APR=/usr
+ APU=/usr
+ APXS=/usr/sbin/apxs
+ SERF=/usr/local
+fi
+
echo "========= autogen.sh"
./autogen.sh || exit $?
@@ -36,11 +52,11 @@ echo "========= configure"
#CFLAGS='-fprofile-arcs -ftest-coverage' \
./configure --enable-javahl --enable-maintainer-mode \
--with-neon=/usr \
- --with-serf=/usr/local \
- --with-apxs=/usr/sbin/apxs \
+ --with-serf=$SERF \
+ --with-apxs=$APXS \
--with-berkeley-db \
- --with-apr=/usr \
- --with-apr-util=/usr \
+ --with-apr=$APR \
+ --with-apr-util=$APU \
--with-jdk=/opt/java/jdk1.6.0_15 \
--with-junit=/home/bt/junit-4.4.jar \
--with-sqlite=/home/bt/packages/sqlite-amalgamation-dir/sqlite3.c \