[clfft] 52/74: travis build fail fix attempt

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.

commit a83ec39b1c781c0e2f5caf2e441990fe3f34a5f5
Author: bragadeesh <bragadeesh.natarajan at amd>
Date:   Wed Jan 6 16:07:56 2016 -0800

    travis build fail fix attempt
---
 .travis.yml | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 648f3e1..8eac272 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ language: cpp
 # sudo: false instructs travis to build our project in a docker VM (faster)
 # Can not yet install fglrx packages with 'false'
 sudo: required # false
+dist: trusty
 
 # os: expands the build matrix to include multiple os's
 # disable linux, as we get sporadic failures on building boost, needs investigation
@@ -66,6 +67,8 @@ addons:
 env:
   global:
     - CLFFT_ROOT=${TRAVIS_BUILD_DIR}/bin/make/release
+    - OPENCL_REGISTRY=https://www.khronos.org/registry/cl
+    - OPENCL_ROOT=${TRAVIS_BUILD_DIR}/bin/opencl
 
 # The following filters our build matrix; we are interested in linux-gcc & osx-clang
 matrix:
@@ -79,7 +82,8 @@ before_install:
   # Remove the following linux clause when fglrx can be installed with sudo: false
   - if [ ${TRAVIS_OS_NAME} == "linux" ]; then
       sudo apt-get update -qq &&
-      sudo apt-get install -qq fglrx=2:13.350.1-0ubuntu0.0.1;
+      sudo apt-get install -qq libboost-all-dev;
+      export BUILD_BOOST="OFF";
     fi
   - if [ ${TRAVIS_OS_NAME} == "linux" ]; then
       export OPENCL_ROOT="${TRAVIS_BUILD_DIR}/opencl-headers";
@@ -89,20 +93,36 @@ before_install:
       brew outdated boost || brew upgrade boost;
       brew outdated cmake || brew upgrade cmake;
     fi
-  # - if [ ${CXX} = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+# - if [ ${CXX} = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
   - cmake --version;
   - ${CC} --version;
   - ${CXX} --version;
 
 install:
-  # 'Precise' only distributes v1.1 opencl headers; download 1.2 headers from khronos website
-  # Remove when the travis VM upgrades to 'trusty' or beyond
+  # The following linux logic is necessary because of Travis's move to the GCE platform, which does not
+  # currently contain packages for fglrx: https://github.com/travis-ci/travis-ci/issues/5221
+  # We build our own linkable .so file
   - if [ ${TRAVIS_OS_NAME} == "linux" ]; then
-      mkdir -p ${OPENCL_ROOT}/include/CL;
-      pushd ${OPENCL_ROOT}/include/CL;
-      wget -w 1 -r -np -nd -nv -A h,hpp https://www.khronos.org/registry/cl/api/1.2/;
+      mkdir -p ${OPENCL_ROOT};
+      pushd ${OPENCL_ROOT};
+      wget ${OPENCL_REGISTRY}/specs/opencl-icd-1.2.11.0.tgz;
+      tar -xf opencl-icd-1.2.11.0.tgz;
+      mv ./icd/* .;
+      mkdir -p inc/CL;
+      pushd inc/CL;
+      wget -r -w 1 -np -nd -nv -A h,hpp https://www.khronos.org/registry/cl/api/1.2/;
+      wget -w 1 -np -nd -nv -A h,hpp https://www.khronos.org/registry/cl/api/2.1/cl.hpp;
+      popd;
+      mkdir -p lib;
+      pushd lib;
+      cmake -G "Unix Makefiles" ..;
+      make;
+      cp ../bin/libOpenCL.so .;
+      popd;
+      mv inc/ include/;
       popd;
     fi
+
   # osx image does not contain cl.hpp file; download from Khronos
   # - if [ ${TRAVIS_OS_NAME} == "osx" ]; then
   #     pushd /System/Library/Frameworks/OpenCL.framework/Versions/A/Headers/;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git