summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrantic10482018-05-14 00:35:34 +0800
committerfrantic10482018-05-14 00:35:34 +0800
commite510c8badb24e61a6bbb1747e2df5545d783f14f (patch)
treeb2afb702a30ad2bcc23b77ef2e94d9e81aea3fcd
parent2b9e1b5e8db82ca8c8b5e274033e68f8056ac035 (diff)
downloadaur-e510c8badb24e61a6bbb1747e2df5545d783f14f.tar.gz
fix gcc5 and gcc54 dependency conflict
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ae70a33d2640..0fe1e39b1a29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
# Generated by mksrcinfo v8
-# Tue Oct 10 10:16:11 UTC 2017
+# Sun May 13 16:35:13 UTC 2018
pkgbase = torch7-cunn-git
pkgdesc = CUDA backend for Torch7 Neural Network Package
pkgver = r819.1ae6aa0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/torch/cunn
arch = x86_64
arch = i686
license = BSD
makedepends = cmake
makedepends = git
- makedepends = gcc5
+ makedepends = gcc54
depends = torch7-git>=r819
depends = cuda
depends = torch7-nn-git
diff --git a/PKGBUILD b/PKGBUILD
index 2b68f6e09772..177a54352622 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
pkgdesc='CUDA backend for Torch7 Neural Network Package'
pkgname='torch7-cunn-git'
pkgver=r819.1ae6aa0
-pkgrel=1
-makedepends=('cmake' 'git' 'gcc5')
+pkgrel=2
+makedepends=('cmake' 'git' 'gcc54')
depends=('torch7-git>=r819' 'cuda' 'torch7-nn-git' 'torch7-cutorch-git')
conflicts=('torch7-cunn')
provides=('torch7-cunn')