llvm and all the projects are a monorepo

2 files changed, 31 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0a1666740b5..24c99f87bbb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libclc-git
 	pkgdesc = Library requirements of the OpenCL C programming language (git version)
-	pkgver = r585.9f6204e
+	pkgver = 0.2.0_r359832.77f8f813a9a
 	pkgrel = 1
 	epoch = 1
 	url = http://libclc.llvm.org/
@@ -10,12 +10,14 @@ pkgbase = libclc-git
 	license = MIT
 	makedepends = clang-git
 	makedepends = git
-	makedepends = python2
+	makedepends = python
+	makedepends = ninja
+	makedepends = cmake
 	provides = libclc
-	conflicts = libclc-amdgpu-git
-	replaces = libclc-amdgpu-git
+	conflicts = libclc
+	replaces = libclc
 	options = staticlibs
-	source = libclc::git+http://llvm.org/git/libclc.git
+	source = llvm-project-git::git+https://github.com/llvm/llvm-project.git
 	md5sums = SKIP
 
 pkgname = libclc-git
diff --git a/PKGBUILD b/PKGBUILD
index 549e967c781c..db5d1148851c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 # Maintainer: Solomon Choina <shlomochoina@gmail.com>
 pkgname=libclc-git
-pkgver=r585.9f6204e
+pkgver=0.2.0_r359832.77f8f813a9a
 pkgrel=1
 epoch=1
 groups=('mesagit')
@@ -10,31 +10,38 @@ arch=('i686' 'x86_64')
 url="http://libclc.llvm.org/"
 license=('MIT')
 provides=('libclc')
-replaces=('libclc-amdgpu-git')
-conflicts=('libclc-amdgpu-git')
-makedepends=('clang-git' 'git' 'python2')
+replaces=('libclc')
+conflicts=('libclc')
+makedepends=('clang-git' 'git' 'python' 'ninja' 'cmake')
 options=('staticlibs')
-source=('libclc::git+http://llvm.org/git/libclc.git')
+source=('llvm-project-git::git+https://github.com/llvm/llvm-project.git')
 md5sums=(SKIP)
 
 pkgver() {
-  cd libclc
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd llvm-project-git
+  echo "0.2.0_r$(git rev-list --count master)"."$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+   cd llvm-project-git
+
+  rm -rf build && mkdir build
+}
 build() {
-  cd libclc
-  
-  sed -i 's/"python < $in >/sys.executable + " < $in >/g' configure.py
-#  sed -i 's/python < $in >/python2 < $in >/g' configure.py
-  python2 ./configure.py --prefix=/usr
-  sed -i 's/-fno-plt//g' Makefile
-  make
+  cd llvm-project-git/build
+
+   cmake ../libclc -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_DATADIR=/usr/lib \
+    -DLIBCLC_TARGETS_TO_BUILD="amdgcn--;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
+
+    ninja all
 }
 
 package() {
-  cd libclc
-  
-  make install DESTDIR="$pkgdir"
+  cd "$srcdir/llvm-project-git/libclc"
+
+  DESTDIR="$pkgdir" ninja -C ../build install
   install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }