[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c9aad4ff4f9f37a2d8685db4b1ce310452f41e89 (commit)
       via  bd5fbfe22bfc95949836bfedea00571b41cdbddd (commit)
       via  de439d4428934b58581993ca0aae39858effc005 (commit)
      from  eb77e8886df84526f42f566632be71d4ed373308 (commit)


- Log -----------------------------------------------------------------
commit c9aad4ff4f9f37a2d8685db4b1ce310452f41e89
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 7 11:22:00 2016 +0100

    Only enable ccache if it's available
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

commit bd5fbfe22bfc95949836bfedea00571b41cdbddd
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 7 00:33:35 2016 +0100

    Use ccache for the unified builds
    
    This may speed up our builds considerably
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

commit de439d4428934b58581993ca0aae39858effc005
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Mar 6 23:34:49 2016 +0100

    For unified builds, make a separate build directory and build there
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cbc052..ac8d812 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,10 @@
 language: c
+cache: ccache
 
 addons:
     apt:
         packages:
+            - ccache
             - clang-3.6
             - gcc-5
             - binutils-mingw-w64
@@ -58,20 +60,34 @@ matrix:
 before_script:
     - sh .travis-create-release.sh $TRAVIS_OS_NAME
     - tar -xvzf _srcdist.tar.gz
-    - cd _srcdist
+    - if echo "$CONFIG_OPTS" | grep "--unified" >/dev/null; then
+          srcdir=../_srcdir;
+          mkdir _build;
+          cd _build;
+          if which ccache >/dev/null; then
+              CC="ccache $CC";
+          fi
+      else
+          srcdir=.;
+          cd _srcdist;
+      fi
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          ./Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
+          $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
       elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          ./Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
+          $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
       else
-          ./config $CONFIG_OPTS;
+          $srcdir/config $CONFIG_OPTS;
       fi
     - cd ..
 
 script:
-    - cd _srcdist
+    - if expr "$CONFIG_OPTS" : "--unified"; then
+          cd _build;
+      else
+          cd _srcdist;
+      fi
     - make
     - if [ -z "$BUILDONLY" ]; then
           if [ -n "$CROSS_COMPILE" ]; then