Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0D30817515 for ; Sun, 23 Nov 2014 06:17:33 +0000 (UTC) Received: (qmail 85448 invoked by uid 500); 23 Nov 2014 06:17:32 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 85412 invoked by uid 500); 23 Nov 2014 06:17:32 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 85402 invoked by uid 99); 23 Nov 2014 06:17:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Nov 2014 06:17:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Nov 2014 06:17:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B40E12388868; Sun, 23 Nov 2014 06:16:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1641163 - /subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh Date: Sun, 23 Nov 2014 06:16:09 -0000 To: commits@subversion.apache.org From: brane@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141123061609.B40E12388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brane Date: Sun Nov 23 06:16:09 2014 New Revision: 1641163 URL: http://svn.apache.org/r1641163 Log: Replicate r1641161 for the svn-sparc-solaris buildslave. * tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh: Only tell configure to --enable-optimize when building branches newer than 1.8.x. Modified: subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh Modified: subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh?rev=1641163&r1=1641162&r2=1641163&view=diff ============================================================================== --- subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh (original) +++ subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh Sun Nov 23 06:16:09 2014 @@ -28,9 +28,10 @@ SVN_VER_MINOR=`awk '/define SVN_VER_MINO cd ../obj grep obj/subversion/tests /etc/mnttab > /dev/null || mount-tmpfs -if [ $SVN_VER_MINOR -eq 8 ]; then - # A bug causes 1.8 --enable-optimize to add -flto which isn't supported - OPTIONS_1_8='--disable-optimize' +# --enable-optimize adds -flto which breaks the 1.8 C tests because +# they link main() from a library. +if [ $SVN_VER_MINOR -gt 8 ]; then + OPTIMIZE_OPTION='--enable-optimize' fi echo "============ configure" @@ -42,7 +43,7 @@ echo "============ configure" --with-sqlite=/export/home/wandisco/buildbot/sqlite-amalgamation-3071501/sqlite3.c \ --enable-optimize \ --disable-shared \ - $OPTIONS_1_8 \ + $OPTIMIZE_OPTION \ || exit $? echo "============ make"