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, 26 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d692e7173da7..4417d4a8bdd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,18 @@
 pkgbase = rocsparse
 	pkgdesc = Next generation SPARSE implementation for ROCm platform.
-	pkgver = 3.0.0
+	pkgver = 3.1.0
 	pkgrel = 1
 	url = https://github.com/ROCmSoftwarePlatform/rocSPARSE
 	arch = x86_64
-	license = NCSAOSL
-	makedepends = git
+	license = custom:NCSAOSL
 	makedepends = cmake
-	makedepends = gcc
-	makedepends = ninja
 	makedepends = hcc
 	makedepends = python2
 	makedepends = rocminfo
 	depends = hcc
 	depends = hip
-	source = https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-3.0.tar.gz
-	sha256sums = 4a982f40733052b4c07b77f8e6fa494abd878be11041fe6b75ab702a58887ba6
+	source = https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-3.1.tar.gz
+	sha256sums = a180765be1e381570d6720b1ea452c71aa21a77bbcb907504d38c9ba2bbf5210
 
 pkgname = rocsparse
 
diff --git a/PKGBUILD b/PKGBUILD
index b32544fa5014..e8cdc06254fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Markus Näther <naetherm@informatik.uni-freiburg.de>
 pkgname=rocsparse
-pkgver=3.0.0
+_pkgver=3.1
+pkgver="$_pkgver.0"
 pkgrel=1
 pkgdesc="Next generation SPARSE implementation for ROCm platform."
 arch=('x86_64')
 url="https://github.com/ROCmSoftwarePlatform/rocSPARSE"
-license=('NCSAOSL')
-depends=(hcc hip)
-makedepends=(git cmake gcc ninja hcc python2 rocminfo)
-srcver="3.0"
-source=("https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-$srcver.tar.gz")
-sha256sums=("4a982f40733052b4c07b77f8e6fa494abd878be11041fe6b75ab702a58887ba6")
+license=('custom:NCSAOSL')
+depends=('hcc' 'hip')
+makedepends=('cmake' 'hcc' 'python2' 'rocminfo')
+source=("https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-$_pkgver.tar.gz")
+sha256sums=('a180765be1e381570d6720b1ea452c71aa21a77bbcb907504d38c9ba2bbf5210')
 
 build() {
   mkdir -p "$srcdir/build"
@@ -21,28 +21,29 @@ build() {
   [[ -e "$srcdir/python" ]] || ln -s /usr/bin/python2 "$srcdir/python"
 
   # fix broken build with stack protection
-  export CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-fstack-protector-strong//')
-  export CFLAGS=$(echo $CFLAGS | sed -e 's/-fstack-protector-strong//')
-  export CPPFLAGS=$(echo $CPPFLAGS | sed -e 's/-fstack-protector-strong//')
+  export CFLAGS="$(sed -e 's/-fstack-protector-strong//' <<< "$CFLAGS")"
+  export CXXFLAGS="$(sed -e 's/-fstack-protector-strong//' <<< "$CXXFLAGS")"
+  export CPPFLAGS="$(sed -e 's/-fstack-protector-strong//' <<< "$CPPFLAGS")"
 
   # compile with HCC
-  export CXX=/opt/rocm/hcc/bin/hcc
+  export CXX="/opt/rocm/hcc/bin/hcc"
 
   # TODO: fix librocsparse.so, it contains references to $srcdir
   cmake -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX="$pkgdir/opt/rocm/rocsparse" \
-        -Drocprim_DIR="/opt/rocm/rocprim/rocprim/lib/cmake/rocprim/" \
+        -DCMAKE_INSTALL_PREFIX=/opt/rocm/rocsparse \
+        -Drocprim_DIR=/opt/rocm/rocprim/rocprim/lib/cmake/rocprim \
         -DBUILD_CLIENTS_SAMPLES=OFF \
-        -G Ninja \
-        "$srcdir/rocSPARSE-rocm-$srcver"
-  ninja
+        "$srcdir/rocSPARSE-rocm-$_pkgver"
+  make
 }
 
 package() {
-  ninja -C "$srcdir/build" install
+  cd "$srcdir/build"
+
+  make DESTDIR="$pkgdir" install
 
-  mkdir -p $pkgdir/etc/ld.so.conf.d
-  cat <<-EOF > $pkgdir/etc/ld.so.conf.d/rocsparse.conf
-    /opt/rocm/rocsparse/lib/
-		EOF
+  install -d "$pkgdir/etc/ld.so.conf.d"
+  cat << EOF > "$pkgdir/etc/ld.so.conf.d/rocsparse.conf"
+/opt/rocm/rocsparse/lib
+EOF
 }