Author: brane
Date: Sun Nov 23 05:37:25 2014
New Revision: 1641159
URL: http://svn.apache.org/r1641159
Log:
Fix the macosx slave to make tests work on the 1.8 branch.
* tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh:
Add --disable-optimize to configure options when building 1.8.x.
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=1641159&r1=1641158&r2=1641159&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh Sun Nov
23 05:37:25 2014
@@ -63,6 +63,13 @@ echo "============ autogen.sh"
cd ${abssrc}
./autogen.sh
+svnminor=$(awk '/define *SVN_VER_MINOR/ { print $3 }'
subversion/include/svn_version.h)
+if [ ${svnminor} -eq 8 ]; then
+ # --enable-optimize adds -flto which breaks the 1.8 C tests because
+ # they link main() from a library.
+ extraconfig='--disable-optimize'
+fi
+
#
# Step 3: Configure
#
@@ -81,7 +88,8 @@ ${abssrc}/configure \
--with-berkeley-db=db.h:"${SVNBB_BDB}/include":${SVNBB_BDB}/lib:db \
--enable-javahl \
--without-jikes \
- --with-junit="${SVNBB_JUNIT}"
+ --with-junit="${SVNBB_JUNIT}" \
+ ${extraconfig}
test -f config.log && mv config.log "${abssrc}/.test-logs/config.log"
#
