Christian Heusel pushed to branch main at Arch Linux / Packaging / Packages / 
libc++


Commits:
df20ee97 by Christian Heusel at 2024-07-19T10:58:09+02:00
upgpkg: 18.1.8-3: fix conflict between libc++ and libc++abi

fixes 
https://gitlab.archlinux.org/archlinux/packaging/packages/libcplusplus/-/issues/3

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
 pkgbase = libc++
        pkgver = 18.1.8
-       pkgrel = 2
+       pkgrel = 3
        url = https://libcxx.llvm.org/
        arch = x86_64
        license = custom:Apache 2.0 with LLVM Exception
@@ -19,7 +19,7 @@ pkgbase = libc++
 
 pkgname = libc++
        pkgdesc = LLVM C++ standard library.
-       depends = libc++abi=18.1.8-2
+       depends = libc++abi=18.1.8-3
        options = staticlibs
 
 pkgname = libc++abi


=====================================
PKGBUILD
=====================================
@@ -6,7 +6,7 @@
 pkgbase=libc++
 pkgname=(libc++ libc++abi)
 pkgver=18.1.8
-pkgrel=2
+pkgrel=3
 url="https://libcxx.llvm.org/";
 license=('custom:Apache 2.0 with LLVM Exception')
 arch=('x86_64')
@@ -56,6 +56,7 @@ package_libc++ () {
   options=('staticlibs')
 
   DESTDIR="$pkgdir" ninja -C build install-cxx
+  DESTDIR="$pkgdir" ninja -C build install-cxx-modules
 
   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
@@ -66,7 +67,7 @@ package_libc++abi() {
   options=('staticlibs')
 
   DESTDIR="$pkgdir" ninja -C build install-cxxabi
-  DESTDIR="$pkgdir" ninja -C build install-cxx-modules
+
   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
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/libcplusplus/-/commit/df20ee97595bab130f7c0d876cca407b9cb838e0

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/libcplusplus/-/commit/df20ee97595bab130f7c0d876cca407b9cb838e0
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to