Update to 2.0.0-1

2 files changed, 43 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0fce5077c04..f24a4fdf3333 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
-# Generated by mksrcinfo v8
-# Sat Oct 14 23:02:04 UTC 2017
 pkgbase = hip
-	pkgver = 1.4.17405
+	pkgdesc = Heterogeneous Interface for Portability ROCm
+	pkgver = 2.0.0
 	pkgrel = 1
+	url = https://github.com/ROCm-Developer-Tools/HIP
 	arch = x86_64
-	source = http://releases.llvm.org/3.9.0/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
-	source = https://github.com/ROCm-Developer-Tools/HIP/archive/preview_1.4.17405.tar.gz
-	md5sums = 03687b22791b8c21813fc015dd507fc0
-	md5sums = 25f17a99f0e4b82903c55c0a2f5406ac
+	makedepends = hcc>=2.0.0
+	makedepends = git
+	makedepends = cmake
+	makedepends = ninja
+	source = git+https://github.com/ROCm-Developer-Tools/HIP.git#tag=roc-2.0.0
+	md5sums = SKIP
 
 pkgname = hip
 
diff --git a/PKGBUILD b/PKGBUILD
index 7faa79805ca0..c55eeb5bf174 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,46 @@
+# Submitter: Chris Kitching
+# Maintainer: Jakub Okoński <jakub@okonski.org>
 pkgname=hip
-pkgver=1.4.17405
+pkgver=2.0.0
 pkgrel=1
+pkgdesc="Heterogeneous Interface for Portability ROCm"
+url="https://github.com/ROCm-Developer-Tools/HIP"
 arch=(x86_64)
-
-# Rather annoyingly, this depends on a _specific_ clang :/
-source=(
-    'http://releases.llvm.org/3.9.0/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz'
-    "https://github.com/ROCm-Developer-Tools/HIP/archive/preview_${pkgver}.tar.gz"
-)
-md5sums=(
-    '03687b22791b8c21813fc015dd507fc0'
-    '25f17a99f0e4b82903c55c0a2f5406ac'
-)
+makedepends=("hcc>=2.0.0" git cmake ninja)
+source=("git+https://github.com/ROCm-Developer-Tools/HIP.git#tag=roc-2.0.0")
+md5sums=("SKIP")
 
 build() {
-    cd $srcdir
-    mkdir -p build
-    cd build
-
-    cmake \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_CXX_COMPILER=clang++ \
-      -DCMAKE_C_COMPILER=clang \
-      -DHIPIFY_CLANG_LLVM_DIR=$srcdir/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04 \
-      ../HIP-preview_${pkgver}
-
-    make -j$(nproc)
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  # TODO: fix libhip_hcc.so and libhip_hcc_static.a
+  #       they contain references to $srcdir, I tried a bunch of things but nothing helps
+
+  cmake -DCMAKE_BUILD_TYPE=Release \
+        -DHCC_HOME=/opt/rocm \
+        -G Ninja \
+        "$srcdir/HIP"
+
+  ninja
 }
 
 package() {
-    cd $srcdir/build
-    make DESTDIR=${pkgdir} install
+  DESTDIR="$pkgdir" ninja -C "$srcdir/build" install
+
+  # Nobody wants your source code, AMD..
+  rm -r "${pkgdir}/opt/rocm/hip/src"
 
-    # Nobody wants your source code, AMD..
-    rm -R "${pkgdir}/opt/rocm/hip/src"
+  # Jakub: these two things below don't seem useful anymore, rest of the ecosystem
+  #        looks in /opt/rocm for CMake finders, libraries etc.
 
-    # Put the finder script somewhere even vaguely convenient.
-    mkdir -p "${pkgdir}/usr/share/cmake-3.9"
-    cp -R "${pkgdir}/opt/rocm/hip/cmake" "${pkgdir}/usr/share/cmake-3.9"
-    rm -R "${pkgdir}/opt/rocm/hip/cmake"
+  # Put the finder script somewhere even vaguely convenient.
+  # mkdir -p "${pkgdir}/usr/share/cmake-3.9"
+  # cp -R "${pkgdir}/opt/rocm/hip/cmake" "${pkgdir}/usr/share/cmake-3.9"
+  # rm -R "${pkgdir}/opt/rocm/hip/cmake"
 
-    # Synthesise an entry for /etc/profile.d to sort out the /bin stuff.
-    mkdir -p "${pkgdir}/etc/profile.d"
-    echo "export PATH=\$PATH:/opt/rocm/hip/bin" > "${pkgdir}/etc/profile.d/hip.sh"
-    chmod a+x "${pkgdir}/etc/profile.d/hip.sh"
+  # Synthesise an entry for /etc/profile.d to sort out the /bin stuff.
+  # mkdir -p "${pkgdir}/etc/profile.d"
+  # echo "export PATH=\$PATH:/opt/rocm/hip/bin" > "${pkgdir}/etc/profile.d/hip.sh"
+  # chmod a+x "${pkgdir}/etc/profile.d/hip.sh"
 }