From f08b638cec4f7097e51fb8713b5296f21523434e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 5 Apr 2019 00:37:10 -0500 Subject: [PATCH 1/3] Fix not finding pocl when /etc/OpenCL/vendors doesn't exist --- travis/build-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 6ceb2eef..94db2b72 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -18,7 +18,7 @@ git clone --branch v2.2.12 https://github.com/OCL-dev/ocl-icd cd ocl-icd curl -L -O https://raw.githubusercontent.com/conda-forge/ocl-icd-feedstock/master/recipe/install-headers.patch git apply install-headers.patch -curl -L -O https://github.com/isuruf/ocl-icd/commit/76fab891c277886ef88af73c57328f8a47bdb6a4.patch +curl -L -O https://github.com/isuruf/ocl-icd/commit/3862386b51930f95d9ad1089f7157a98165d5a6b.patch git apply 76fab891c277886ef88af73c57328f8a47bdb6a4.patch autoreconf -i chmod +x configure -- GitLab From 63bff10fce09923c0dfbc452859b0675eb55bf9e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 5 Apr 2019 02:05:05 -0500 Subject: [PATCH 2/3] Use commit instead of branch --- travis/build-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 94db2b72..fc5e8804 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -16,7 +16,7 @@ rm -rf ruby-2.1.2 git clone --branch v2.2.12 https://github.com/OCL-dev/ocl-icd cd ocl-icd -curl -L -O https://raw.githubusercontent.com/conda-forge/ocl-icd-feedstock/master/recipe/install-headers.patch +curl -L -O https://raw.githubusercontent.com/conda-forge/ocl-icd-feedstock/22625432a0ae85920825dfeb103af9fe7bd6a950/recipe/install-headers.patch git apply install-headers.patch curl -L -O https://github.com/isuruf/ocl-icd/commit/3862386b51930f95d9ad1089f7157a98165d5a6b.patch git apply 76fab891c277886ef88af73c57328f8a47bdb6a4.patch -- GitLab From b34d56de81341599ce2cdde9afd254c31c1aeb13 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 5 Apr 2019 09:03:47 -0500 Subject: [PATCH 3/3] Fix applying patch --- travis/build-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index fc5e8804..b004fa3d 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -19,7 +19,7 @@ cd ocl-icd curl -L -O https://raw.githubusercontent.com/conda-forge/ocl-icd-feedstock/22625432a0ae85920825dfeb103af9fe7bd6a950/recipe/install-headers.patch git apply install-headers.patch curl -L -O https://github.com/isuruf/ocl-icd/commit/3862386b51930f95d9ad1089f7157a98165d5a6b.patch -git apply 76fab891c277886ef88af73c57328f8a47bdb6a4.patch +git apply 3862386b51930f95d9ad1089f7157a98165d5a6b.patch autoreconf -i chmod +x configure ./configure --prefix=/usr -- GitLab