Author: jamessan
Date: Thu Jul 27 03:56:29 2017
New Revision: 1803130
URL: http://svn.apache.org/viewvc?rev=1803130&view=rev
Log:
* tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh:
When building svn >= 1.10, build against the internal copy of lz4.
Modified:
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh?rev=1803130&r1=1803129&r2=1803130&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh Thu Jul
27 03:56:29 2017
@@ -71,6 +71,10 @@ if [ ${svnminor} -gt 8 ]; then
optimizeconfig=' --enable-optimize'
fi
+if [ ${svnminor} -ge 10 ]; then
+ lz4config='--with-lz4=internal'
+fi
+
#
# Step 3: Configure
#
@@ -88,6 +92,7 @@ ${abssrc}/configure \
--with-berkeley-db=db.h:"${SVNBB_BDB}/include":${SVNBB_BDB}/lib:db \
--enable-javahl \
--without-jikes \
+ ${lz4config} \
--with-junit="${SVNBB_JUNIT}"
test -f config.log && mv config.log "${abssrc}/.test-logs/config.log"
