diff options
| author | joeda | 2017-09-09 17:00:44 +0200 |
|---|---|---|
| committer | joeda | 2017-09-09 17:00:44 +0200 |
| commit | dcd9c30805135911af98249dfccff5b8d40d165a (patch) | |
| tree | 8938c1c017387e33e2202726d5ea7669cae89f90 | |
| parent | c330c3e58f315e19a1d6d89d4a66bb7bc0cf9c3a (diff) | |
| download | aur-dcd9c30805135911af98249dfccff5b8d40d165a.tar.gz | |
added CMake patch (see https://github.com/opencv/opencv/pull/9408)
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | cmake_ccache.patch | 14 |
3 files changed, 27 insertions, 2 deletions
@@ -19,7 +19,9 @@ pkgbase = opencv2 optdepends = libcl: For coding with OpenCL optdepends = python2-numpy: Python 2.x interface source = 2.4.13.3.zip::https://codeload.github.com/opencv/opencv/zip/2.4.13.3 + source = cmake_ccache.patch sha256sums = 838a2ef5821db868f71c26e248427d7be9f35f2fb996acd1b973150c8dd11656 + sha256sums = 1a8afc6bf9c9a80204385911749250d179709f915e416fe2791fdfc2a7b4012a pkgname = opencv2 conflicts = opencv @@ -54,8 +54,10 @@ optdepends=('opencv-samples' 'libcl: For coding with OpenCL' 'python2-numpy: Python 2.x interface') -source=("$pkgver.zip::https://codeload.github.com/opencv/opencv/zip/$pkgver") -sha256sums=('838a2ef5821db868f71c26e248427d7be9f35f2fb996acd1b973150c8dd11656') +source=("$pkgver.zip::https://codeload.github.com/opencv/opencv/zip/$pkgver" + "cmake_ccache.patch") +sha256sums=('838a2ef5821db868f71c26e248427d7be9f35f2fb996acd1b973150c8dd11656' + '1a8afc6bf9c9a80204385911749250d179709f915e416fe2791fdfc2a7b4012a') _cmakeopts=('-D WITH_CUDA=OFF' # Disable CUDA for now because GCC 6.1.1 and nvcc don't play along yet '-D WITH_OPENCL=ON' @@ -87,6 +89,12 @@ _cmakeopts=('-D WITH_CUDA=OFF' # Disable CUDA for now because GCC 6.1.1 and nvcc "-D ENABLE_SSE42=$_FORCE_SSE42" "-D ENABLE_AVX=$_FORCE_AVX" "-D ENABLE_AVX2=$_FORCE_AVX2") +prepare() { + cd "$_pkgbase-$pkgver/cmake" +# Patch for broken CMake file +# See https://github.com/opencv/opencv/pull/9408 + patch -p0 -i ../../cmake_ccache.patch +} build() { cd "$srcdir/$_pkgbase-$pkgver" @@ -96,6 +104,7 @@ build() { cmake ${_cmakeopts[@]} .. # change this to i. e. make -j16 if your CPUs have 16 threads to speed up build process + # make -j16 make } diff --git a/cmake_ccache.patch b/cmake_ccache.patch new file mode 100644 index 000000000000..9aef2f600145 --- /dev/null +++ b/cmake_ccache.patch @@ -0,0 +1,14 @@ +--- OpenCVCompilerOptions.cmake 2017-09-09 16:20:07.966725688 +0200 ++++ OpenCVCompilerOptions.cmake.fixed 2017-09-09 16:15:54.000000000 +0200 +@@ -18,9 +18,9 @@ + message(STATUS "Unable to compile program with enabled ccache, reverting...") + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${__OLD_RULE_LAUNCH_COMPILE}") + endif() +- else() +- message(STATUS "Looking for ccache - not found") + endif() ++ else() ++ message(STATUS "Looking for ccache - not found") + endif() + endif() + |