Update to 15.0.7-3.

2 files changed, 17 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c8ca98cd92a..52e6d9a93de7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libc++-msan
-	pkgver = 14.0.6
-	pkgrel = 1
+	pkgver = 15.0.7
+	pkgrel = 3
 	url = https://libcxx.llvm.org/
 	arch = x86_64
 	license = custom:Apache 2.0 with LLVM Exception
@@ -11,15 +11,15 @@ pkgbase = libc++-msan
 	makedepends = python
 	depends = gcc-libs
 	options = !lto
-	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz
-	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig
 	validpgpkeys = 474E22316ABF4785A88C6E8EA2C794A986419D8A
-	sha512sums = 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+	sha512sums = 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 	sha512sums = SKIP
 
 pkgname = libc++-msan
 	pkgdesc = LLVM C++ standard library - with support for memory sanitizers.
-	depends = libc++abi-msan=14.0.6-1
+	depends = libc++abi-msan=15.0.7-3
 	provides = libc++
 	conflicts = libc++
 	options = staticlibs
@@ -29,9 +29,3 @@ pkgname = libc++abi-msan
 	provides = libc++abi
 	conflicts = libc++abi
 	options = staticlibs
-
-pkgname = libc++experimental-msan
-	pkgdesc = LLVM C++ experimental library - with support for memory sanitizers.
-	depends = libc++-msan=14.0.6-1
-	provides = libc++experimental
-	conflicts = libc++experimental
diff --git a/PKGBUILD b/PKGBUILD
index 0d7ab03f9782..6140a369f3a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 # Contributor: MThinkCpp <mtc [dot] maintainer [at] outlook [dot] com>
 
 pkgbase=libc++-msan
-pkgname=(libc++-msan libc++abi-msan libc++experimental-msan)
-pkgver=14.0.6
-pkgrel=1
+pkgname=(libc++-msan libc++abi-msan)
+pkgver=15.0.7
+pkgrel=3
 url="https://libcxx.llvm.org/"
 license=('custom:Apache 2.0 with LLVM Exception')
 arch=('x86_64')
@@ -16,7 +16,7 @@ makedepends=('clang' 'cmake' 'ninja' 'python')
 checkdepends=('llvm')
 options=(!lto)
 source=("https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz"{,.sig})
-sha512sums=('6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13'
+sha512sums=('4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52'
             'SKIP')
 validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
  
@@ -36,16 +36,17 @@ build() {
     -DCMAKE_CXX_COMPILER=clang++ \
     -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
     -DLLVM_EXTERNAL_LIT=/usr/bin/lit \
-    -DLIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=NO \
+    -DLLVM_ENABLE_PIC=ON \
     -DLLVM_USE_SANITIZER=MemoryWithOrigins \
     ../llvm-project-$pkgver.src/runtimes
-  ninja cxx cxxabi cxx_experimental
+  ninja cxx cxxabi
 }
 
-# Enabling MSAN seems to break the tests?
-# check() {
-#   ninja -C build check-cxx check-cxxabi
-# }
+check() {
+  # the tests are extremely slow
+  # ninja -C build check-cxx check-cxxabi
+  true
+}
 
 # Do not remove the space before the () or commitpkg will
 # accidentally to run this function on the system (!!!) 
@@ -72,14 +73,3 @@ package_libc++abi-msan() {
   install -Dm0644 llvm-project-$pkgver.src/libcxxabi/CREDITS.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/CREDITS
   install -Dm0644 llvm-project-$pkgver.src/libcxxabi/LICENSE.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
 }
- 
-package_libc++experimental-msan() {
-  depends=("libc++-msan=$pkgver-$pkgrel")
-  pkgdesc='LLVM C++ experimental library - with support for memory sanitizers.'
-  provides=('libc++experimental')
-  conflicts=('libc++experimental')
-  
-  install -Dm0644 -t "$pkgdir"/usr/lib/ build/lib/libc++experimental.a
-  install -Dm0644 llvm-project-$pkgver.src/libcxx/CREDITS.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/CREDITS
-  install -Dm0644 llvm-project-$pkgver.src/libcxx/LICENSE.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
-}