summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin T. H. Sandsmark2019-12-08 15:07:13 +0100
committerMartin T. H. Sandsmark2019-12-08 15:07:34 +0100
commitfd3302080b342f45d2d235996602bcafa34a9aad (patch)
treebf2a325e95b493c2c1fb6329b02a1ed78549daac
parente1d485f46b8c89ff1e3d36c871356a2ddfb9effb (diff)
downloadaur-dlib-git.tar.gz
steal stuff from the normal dlib package (aka. fix cuda stuff)
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD22
2 files changed, 20 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e1df38741097..50b25e5f6a2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
pkgbase = dlib-git
pkgdesc = General purpose C++ library using contract programming and modern C++ techniques
- pkgver = r7572.0072afbc
+ pkgver = r7718.b0e3c360
pkgrel = 1
url = http://www.dlib.net/
arch = i686
arch = x86_64
license = Boost Software License
+ makedepends = cmake
+ makedepends = git
depends = glibc
optdepends = cblas: for BLAS support
optdepends = cuda: for CUDA support
diff --git a/PKGBUILD b/PKGBUILD
index b5035200698d..d071a4827dd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=dlib-git
_pkgname=dlib
pkgrel=1
-pkgver=r7572.0072afbc
+pkgver=r7718.b0e3c360
pkgdesc="General purpose C++ library using contract programming and modern C++ techniques"
arch=('i686' 'x86_64')
url="http://www.dlib.net/"
@@ -18,6 +18,7 @@ optdepends=('cblas: for BLAS support'
'sqlite: for sqlite support')
source=('git+https://github.com/davisking/dlib')
sha256sums=(SKIP)
+makedepends=('cmake' 'git')
provides=('dlib')
conflicts=('dlib')
replaces=('dlib')
@@ -29,10 +30,21 @@ pkgver() {
build() {
cd "${srcdir}/${_pkgname}"
- mkdir -p build
- cd build
- export CMAKE_PREFIX_PATH=/opt/cuda/
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCUDA_SDK_ROOT_DIR=/opt/cuda/ -DCUDA_TOOLKIT_ROOT_DIR=/opt/cuda/ -DCUDA_HOST_COMPILER=/usr/bin/gcc-7 -DCMAKE_INSTALL_LIBDIR=/usr/lib/
+ mkdir -p build && cd build
+ cmake \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DCUDA_HOST_COMPILER='/opt/cuda/bin/gcc' \
+ -DCMAKE_BUILD_TYPE=Release \
+ ..
+ if [[ -f "/usr/lib/ccache/bin/nvcc-ccache" ]] ; then
+ cmake \
+ -DCUDA_NVCC_EXECUTABLE=/usr/lib/ccache/bin/nvcc-ccache \
+ -DCUDA_HOST_COMPILER=/usr/lib/ccache/bin/gcc \
+ ..
+ fi
+ make
}
package() {