Resolve all dependency issues

2 files changed, 21 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 982012549088..6c0db81cd51a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,14 @@
 pkgbase = mxnet
 	pkgdesc = Flexible and Efficient Library for Deep Learning
 	pkgver = 0.9.3a
-	pkgrel = 2
+	pkgrel = 3
 	url = http://mxnet.io/
 	arch = x86_64
-	license = Apache2
+	license = Apache-2.0
+	license = BSD-3-Clause
 	makedepends = git
+	makedepends = wget
+	depends = cblas
 	optdepends = cuda: GPU support
 	optdepends = cudnn: GPU support
 	optdepends = opencv: computer vision support
diff --git a/PKGBUILD b/PKGBUILD
index 4d1992fa0af8..9a8c4caf2e77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Carl Åkerlindh <carl.akerlindh at gmail dot com>
 pkgname=mxnet
 pkgver=0.9.3a
-pkgrel=2
+pkgrel=3
 pkgdesc="Flexible and Efficient Library for Deep Learning"
 arch=('x86_64')
 url="http://mxnet.io/"
-license=('Apache2')
-depends=()
+license=('Apache-2.0' 'BSD-3-Clause')
+depends=('cblas')
 optdepends=('cuda: GPU support'
             'cudnn: GPU support'
             # 'intel-mkl: MKL support'
             'opencv: computer vision support')
-makedepends=(git)
+makedepends=('git' 'wget')
 provides=(libmxnet)
 source=("$pkgname::git+https://github.com/dmlc/mxnet")
 md5sums=('SKIP')
@@ -23,15 +23,16 @@ prepare() {
   cp make/config.mk .
   if (pacman -Q cuda &>/dev/null && pacman -Q cudnn &>/dev/null); then
     msg2 "CUDA support enabled"
-    echo "USE_CUDA=1" >>config.mk
-    echo "USE_CUDA_PATH=/opt/cuda" >>config.mk
-    echo "USE_CUDNN=1" >>config.mk
+    echo "USE_CUDA = 1" >> config.mk
+    echo "USE_CUDA_PATH = /opt/cuda" >> config.mk
+    echo "USE_CUDNN = 1" >> config.mk
+    echo "ADD_LDFLAGS = -L/opt/cuda/lib64/stubs" >> config.mk
   else
     msg2 "CUDA support disabled"
   fi
-  echo "MKLML_ROOT=$srcdir/mklml" >>config.mk
-  echo "USE_MKL2017=1" >>config.mk
-  echo "USE_MKL2017_EXPERIMENTAL=1" >>config.mk
+  echo "MKLML_ROOT = $srcdir/mklml" >> config.mk
+  echo "USE_MKL2017 = 1" >> config.mk
+  echo "USE_MKL2017_EXPERIMENTAL = 1" >> config.mk
   # if (pacman -Q intel-mkl &>/dev/null); then
   #   msg2 "MKL support enabled"
   #   echo "USE_BLAS=mkl" >>config.mk
@@ -44,19 +45,19 @@ prepare() {
     msg2 "OpenCV support enabled"
   else
     msg2 "OpenCV support disabled"
-    echo "USE_OPENCV=0" >>config.mk
+    echo "USE_OPENCV = 0" >> config.mk
   fi
 }
 
 build() {
   cd "$srcdir/$pkgname"
-  make -j$(nproc)
+  make
 }
 
 package() {
   cd "$pkgdir"
   install -D "$srcdir/$pkgname/lib/libmxnet.so" "$pkgdir/usr/lib/libmxnet.so"
-  install -D "$srcdir/mklml/lib/libmklml_gnu.so" "$pkgdir/usr/lib/libmklml_intel.so"
-  # install -D "$srcdir/mklml/lib/libmklml_intel.so" "$pkgdir/usr/lib/libmklml_intel.so"
-  # install -D "$srcdir/mklml/lib/libiomp5.so" "$pkgdir/usr/lib/libiomp5.so"
+  install -D "$srcdir/mklml/lib/libmklml_intel.so" "$pkgdir/usr/lib/libmklml_intel.so"
+  install -D "$srcdir/mklml/lib/libiomp5.so" "$pkgdir/usr/lib/libiomp5.so"
+  install -D "$srcdir/mklml/license.txt" "$pkgdir/usr/lib/LICENCE"
 }