ocaml support moved to its own sub-package

2 files changed, 38 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f8236f8b8ce..4f50482ff7f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = llvm-git
-	pkgver = 10.0.0_r330902.86cdf74dc87
+	pkgver = 10.0.0_r331726.33e882d5ada
 	pkgrel = 1
 	url = https://llvm.org/
 	arch = x86_64
@@ -32,24 +32,24 @@ pkgbase = llvm-git
 
 pkgname = llvm-git
 	pkgdesc = LLVM development version. includes clang and many other tools
-	depends = llvm-libs-git=10.0.0_r330902.86cdf74dc87-1
+	depends = llvm-libs-git=10.0.0_r331726.33e882d5ada-1
 	depends = perl
 	optdepends = python: for scripts
 	optdepends = python-setuptools: for using lit (LLVM Integrated Tester)
 	optdepends = ocaml: for ocaml support
 	provides = aur-llvm-git
-	provides = compiler-rt-git=10.0.0_r330902.86cdf74dc87-1
-	provides = clang-git=10.0.0_r330902.86cdf74dc87-1
-	provides = lld-git=10.0.0_r330902.86cdf74dc87-1
-	provides = lldb-git=10.0.0_r330902.86cdf74dc87-1
-	provides = polly-git=10.0.0_r330902.86cdf74dc87-1
-	provides = llvm-ocaml-git=10.0.0_r330902.86cdf74dc87-1
-	provides = compiler-rt=10.0.0_r330902.86cdf74dc87-1
-	provides = clang=10.0.0_r330902.86cdf74dc87-1
-	provides = lld=10.0.0_r330902.86cdf74dc87-1
-	provides = lldb=10.0.0_r330902.86cdf74dc87-1
-	provides = polly=10.0.0_r330902.86cdf74dc87-1
-	provides = llvm-ocaml=10.0.0_r330902.86cdf74dc87-1
+	provides = compiler-rt-git=10.0.0_r331726.33e882d5ada-1
+	provides = clang-git=10.0.0_r331726.33e882d5ada-1
+	provides = lld-git=10.0.0_r331726.33e882d5ada-1
+	provides = lldb-git=10.0.0_r331726.33e882d5ada-1
+	provides = polly-git=10.0.0_r331726.33e882d5ada-1
+	provides = llvm-ocaml-git=10.0.0_r331726.33e882d5ada-1
+	provides = compiler-rt=10.0.0_r331726.33e882d5ada-1
+	provides = clang=10.0.0_r331726.33e882d5ada-1
+	provides = lld=10.0.0_r331726.33e882d5ada-1
+	provides = lldb=10.0.0_r331726.33e882d5ada-1
+	provides = polly=10.0.0_r331726.33e882d5ada-1
+	provides = llvm-ocaml=10.0.0_r331726.33e882d5ada-1
 	conflicts = llvm
 	conflicts = compiler-rt
 	conflicts = clang
@@ -67,6 +67,6 @@ pkgname = llvm-libs-git
 	depends = ncurses
 	depends = libxml2
 	provides = aur-llvm-libs-git
-	provides = llvm-libs=10.0.0_r330902.86cdf74dc87-1
+	provides = llvm-libs=10.0.0_r331726.33e882d5ada-1
 	conflicts = llvm-libs
 
diff --git a/PKGBUILD b/PKGBUILD
index 0b98e8d2568a..a37dc9975005 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
 
 
 pkgname=('llvm-git' 'llvm-libs-git')
-pkgver=10.0.0_r330902.86cdf74dc87
+pkgver=10.0.0_r331726.33e882d5ada
 pkgrel=1
 arch=('x86_64')
 url="https://llvm.org/"
@@ -45,6 +45,11 @@ _python_optimize() {
   python -OO -m compileall "$@"
 }
 
+ _ocaml_ver() {
+    { pacman -Q ocaml 2>/dev/null || pacman -Sp --print-format '%n %v' ocaml ;} \
+     | awk '{ print $2 }' | cut -d - -f 1 | cut -d . -f 1,2,3
+}
+    
 pkgver() {
     cd llvm-project/llvm
 
@@ -67,7 +72,7 @@ prepare() {
     
     cd llvm-project
     # llvm-project contains a lot of stuff, remove parts that aren't used by this package
-    rm -rf debuginfo-tests libclc libcxx libcxxabi libunwind llgo openmp parallel-libs pstl
+    rm -rf debuginfo-tests libclc libcxx libcxxabi libunwind llgo openmp parallel-libs pstl libc
     
     cd clang
     patch --forward --strip=1 --input="$srcdir"/enable-SSP-and-PIE-by-default.patch
@@ -153,6 +158,12 @@ package_llvm-git() {
     mv -f "$pkgdir"/usr/lib/lib{LLVM,LTO}*.so* "$srcdir"
     mv -f "$pkgdir"/usr/lib/LLVMgold.so "$srcdir"
 
+    # OCaml bindings go to a separate package
+    rm -rf "$srcdir"/ocaml.{lib,doc}
+    mv "$pkgdir"/usr/lib/ocaml "$srcdir"/ocaml.lib
+    mv "$pkgdir"/usr/share/doc/llvm/ocaml-html "$srcdir"/ocaml.doc
+
+    
     if [[ $CARCH == x86_64 ]]; then
         # Needed for multilib (https://bugs.archlinux.org/task/29951)
         # Header stub is taken from Fedora
@@ -205,4 +216,13 @@ package_llvm-libs-git() {
     install -Dm644 polly/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/polly-LICENSE
 }
 
-# vim:set ts=2 sw=2 et:
+package_llvm-ocaml-git() {
+  pkgdesc="OCaml bindings for LLVM"
+  depends=('llvm-git' "ocaml=$(_ocaml_ver)" 'ocaml-ctypes')
+
+  install -d "$pkgdir"/{usr/lib,usr/share/doc/$pkgname}
+  cp -a "$srcdir"/ocaml.lib "$pkgdir"/usr/lib/ocaml
+  cp -a "$srcdir"/ocaml.doc "$pkgdir"/usr/share/doc/$pkgname/html
+
+  install -Dm644 "$srcdir"/llvm-$pkgver.src/LICENSE.TXT  "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}