Revert to version 15 libraries

2 files changed, 12 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ba589b01e2a..2af8926290bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = chapel
 	pkgdesc = Programming language designed for productive parallel computing at scale
 	pkgver = 1.31.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://chapel-lang.org/
 	arch = x86_64
 	arch = arm
@@ -10,8 +10,9 @@ pkgbase = chapel
 	makedepends = cmake
 	depends = python
 	depends = perl
-	depends = llvm
-	depends = clang
+	depends = llvm15
+	depends = llvm15-libs
+	depends = clang15
 	source = https://github.com/chapel-lang/chapel/releases/download/1.31.0/chapel-1.31.0.tar.gz
 	sha256sums = 4b861c9a354f6fcf66081256f7ec703d6dd2cd68ea363b400d10ac00bf308679
 
diff --git a/PKGBUILD b/PKGBUILD
index 5923a8e4d92b..aab93bfcc557 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,25 @@
 
 pkgname=chapel
 pkgver=1.31.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Programming language designed for productive parallel computing at scale"
 url="https://chapel-lang.org/"
 arch=('x86_64' 'arm')
 license=('Apache')
-depends=('python' 'perl' 'llvm' 'clang')
+# depends=('python' 'perl' 'llvm' 'clang')
+depends=('python' 'perl' 'llvm15' 'llvm15-libs' 'clang15') # if using old versions
 makedepends=('git' 'cmake')
 source=("https://github.com/chapel-lang/chapel/releases/download/${pkgver}/chapel-${pkgver}.tar.gz")
 sha256sums=('4b861c9a354f6fcf66081256f7ec703d6dd2cd68ea363b400d10ac00bf308679')
-
             
 
 build() {
         cd "${srcdir}/${pkgname}-${pkgver}"
+        # if depending on old versions like llvmXX and clangXX
+        export CHPL_TARGET_CPU="native"
+        export CHPL_HOST_COMPILER="clang"
+        export CHPL_HOST_CC="/usr/lib/llvm15/bin/clang"
+        export CHPL_HOST_CXX="/usr/lib/llvm15/bin/clang++"
         ./configure --prefix=/usr
         make
 }