Update to 14.0.6.

1 files changed, 18 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ee7a21b94310..0d7ab03f9782 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,33 +6,23 @@
 
 pkgbase=libc++-msan
 pkgname=(libc++-msan libc++abi-msan libc++experimental-msan)
-pkgver=13.0.1
+pkgver=14.0.6
 pkgrel=1
 url="https://libcxx.llvm.org/"
 license=('custom:Apache 2.0 with LLVM Exception')
 arch=('x86_64')
 depends=('gcc-libs')
-makedepends=('clang' 'cmake' 'llvm' 'libunwind' 'ninja' 'python')
+makedepends=('clang' 'cmake' 'ninja' 'python')
+checkdepends=('llvm')
 options=(!lto)
-source=("https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz"{,.sig}
-        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/libcxx-$pkgver.src.tar.xz"{,.sig}
-        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/libcxxabi-$pkgver.src.tar.xz"{,.sig})
-noextract=("${source[@]##*/}")
-sha512sums=('05fbe8708ac3d0dfef3a9135ee88185a95ed492095429a97d33b8aadb0187e59ad42d1a7184f02b5c84fdd31f3d7227c65bd292ed0aa039b29522e59cf90a965'
-            'SKIP'
-            '72970fbb3db44a652e89ace7843e992b4f118c978fa0fa7035bf5825cb6958cf71f7c80b56c1970977177bb3bcbf81309d4f01c29b3ac1cd057be54baf55e56f'
-            'SKIP'
-            '1a7c032ee34643518be01edddc16b1c872f339ed2944d31573438d38a018abc801a53f3fbd97e6a3d6ee58a6ed55d9703a8531ac7290c1d6e3e5593b97186749'
+source=("https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz"{,.sig})
+sha512sums=('6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13'
             'SKIP')
-validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar@redhat.com> (.1 releases)
-              'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org> (.0 releases)
+validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
  
 prepare() {
-  mkdir -p build llvm/projects/libcxx llvm/projects/libcxxabi
-  bsdtar --strip-components 1 -zxf "${source[0]##*/}" -C llvm
-  bsdtar --strip-components 1 -zxf "${source[2]##*/}" -C llvm/projects/libcxx
-  bsdtar --strip-components 1 -zxf "${source[4]##*/}" -C llvm/projects/libcxxabi
-  sed -i 's/CREDITS.TXT/CREDITS/' llvm/projects/libcxx/LICENSE.TXT llvm/projects/libcxxabi/LICENSE.TXT
+  mkdir -p build
+  sed -i 's/CREDITS.TXT/CREDITS/' llvm-project-$pkgver.src/libcxx{,abi}/LICENSE.TXT
 }
  
 build() {
@@ -44,10 +34,12 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_C_COMPILER=clang \
     -DCMAKE_CXX_COMPILER=clang++ \
+    -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
+    -DLLVM_EXTERNAL_LIT=/usr/bin/lit \
     -DLIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=NO \
     -DLLVM_USE_SANITIZER=MemoryWithOrigins \
-    "$srcdir"/llvm
-  ninja cxx cxx_experimental
+    ../llvm-project-$pkgver.src/runtimes
+  ninja cxx cxxabi cxx_experimental
 }
 
 # Enabling MSAN seems to break the tests?
@@ -66,8 +58,8 @@ package_libc++-msan () {
 
   DESTDIR="$pkgdir" ninja -C build install-cxx
 
-  install -Dm0644 "$srcdir"/llvm/projects/libcxx/CREDITS.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/CREDITS
-  install -Dm0644 "$srcdir"/llvm/projects/libcxx/LICENSE.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
+  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
 }
  
 package_libc++abi-msan() {
@@ -77,8 +69,8 @@ package_libc++abi-msan() {
   conflicts=('libc++abi')
   
   DESTDIR="$pkgdir" ninja -C build install-cxxabi
-  install -Dm0644 "$srcdir"/llvm/projects/libcxxabi/CREDITS.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/CREDITS
-  install -Dm0644 "$srcdir"/llvm/projects/libcxxabi/LICENSE.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
+  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() {
@@ -88,6 +80,6 @@ package_libc++experimental-msan() {
   conflicts=('libc++experimental')
   
   install -Dm0644 -t "$pkgdir"/usr/lib/ build/lib/libc++experimental.a
-  install -Dm0644 llvm/projects/libcxx/CREDITS.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/CREDITS
-  install -Dm0644 llvm/projects/libcxx/LICENSE.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
+  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
 }