Cleanup

Consistent style across project
Remove extraneous dependencies
Update packages
Update checksums and .SRCINFO
Specify proper license
Fix prefixes
Prefer make to ninja
Much more

TODO: miopen, rocm-cmake{,-git}, rock-dkms{,-git},
      Remove duplicates in makedepends and depends
      git submodules

2 files changed, 18 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c5d2559be5c..5fae88464d95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,17 +4,12 @@ pkgbase = miopen
 	pkgrel = 2
 	url = https://github.com/ROCmSoftwarePlatform/MIOpen
 	arch = x86_64
-	license = NCSAOSL
-	makedepends = git
+	license = custom:NCSAOSL
 	makedepends = opencl-headers
 	makedepends = cmake
-	makedepends = gcc
-	makedepends = ninja
-	makedepends = ocl-icd
 	makedepends = hip
 	makedepends = hcc
 	makedepends = rocblas
-	makedepends = boost>=1.58
 	makedepends = miopengemm
 	depends = ocl-icd
 	depends = hip
diff --git a/PKGBUILD b/PKGBUILD
index fa1a60479758..ec95aa7391e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Jakub Okoński <jakub@okonski.org>
 pkgname=miopen
 # upstream has different versioning, let's keep it at 2.3.0 until they catch up
-_srcver=1.8.1
-pkgver=2.3.0.$_srcver
+_pkgver=1.8.1
+pkgver=2.3.0.$_pkgver
 pkgrel=2
 pkgdesc="AMD's Machine Intelligence Library"
 arch=('x86_64')
 url="https://github.com/ROCmSoftwarePlatform/MIOpen"
-license=('NCSAOSL')
-depends=(ocl-icd hip hcc rocblas "boost>=1.58" clang-ocl)
-makedepends=(git opencl-headers cmake gcc ninja ocl-icd hip hcc rocblas "boost>=1.58" miopengemm)
-source=("https://github.com/ROCmSoftwarePlatform/MIOpen/archive/$_srcver.tar.gz")
+license=('custom:NCSAOSL')
+depends=('ocl-icd' 'hip' 'hcc' 'rocblas' 'boost>=1.58' 'clang-ocl')
+makedepends=('opencl-headers' 'cmake' 'hip' 'hcc' 'rocblas' 'miopengemm')
+source=("https://github.com/ROCmSoftwarePlatform/MIOpen/archive/$_pkgver.tar.gz")
 sha256sums=('58941138cea6432d0a9218c1c9af1784587bff58501b8a38d7f634fc544321a3')
 
 build() {
@@ -18,25 +18,25 @@ build() {
   cd "$srcdir/build"
 
   # compile with HCC
-  export CXX=/opt/rocm/hcc/bin/hcc
+  export CXX="/opt/rocm/hcc/bin/hcc"
 
   # TODO: fix libMIOpen.so, it contains references to $srcdir
   cmake -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX="$pkgdir/opt/rocm/miopen" \
+        -DCMAKE_INSTALL_PREFIX=/opt/rocm/miopen \
         -DMIOPEN_BACKEND=HIP \
         -DCMAKE_PREFIX_PATH="/opt/rocm/hcc;/opt/rocm/hip" \
         -DHALF_INCLUDE_DIR="$startdir" \
-        -G Ninja \
-        "$srcdir/MIOpen-$_srcver"
-  ninja
+        "$srcdir/MIOpen-$_pkgver"
+  make
 }
 
 package() {
-  ninja -C "$srcdir/build" install
+  cd "$srcdir/build"
 
-  mkdir -p $pkgdir/etc/ld.so.conf.d
-  cat <<-EOF > $pkgdir/etc/ld.so.conf.d/miopen.conf
-    /opt/rocm/miopen/lib/
-		EOF
-}
+  make DESTDIR="$pkgdir" install
 
+  install -d "$pkgdir/etc/ld.so.conf.d"
+  cat << EOF > "$pkgdir/etc/ld.so.conf.d/miopen.conf"
+/opt/rocm/miopen/lib
+EOF
+}