Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging 
/ Packages / libc++


Commits:
03c7f519 by Jan Alexander Steffens (heftig) at 2024-07-19T11:09:14+02:00
Simplify options

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -13,6 +13,7 @@ pkgbase = libc++
        depends = gcc-libs
        depends = glibc
        options = !lto
+       options = staticlibs
        source = 
https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-project-18.1.8.src.tar.xz
        source = 
https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-project-18.1.8.src.tar.xz.sig
        validpgpkeys = 474E22316ABF4785A88C6E8EA2C794A986419D8A
@@ -23,8 +24,6 @@ pkgname = libc++
        depends = gcc-libs
        depends = glibc
        depends = libc++abi=18.1.8-4
-       options = staticlibs
 
 pkgname = libc++abi
        pkgdesc = Low level support for the LLVM C++ standard library
-       options = staticlibs


=====================================
PKGBUILD
=====================================
@@ -14,7 +14,7 @@ arch=('x86_64')
 depends=('gcc-libs' 'glibc')
 makedepends=('clang' 'cmake' 'ninja' 'python')
 checkdepends=('llvm')
-options=('!lto')
+options=('!lto' 'staticlibs')
 
source=("https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz"{,.sig})
 
sha512sums=('25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db'
             'SKIP')
@@ -53,7 +53,6 @@ check() {
 # accidentally to run this function on the system (!!!)
 package_libc++ () {
   depends+=("libc++abi=$pkgver-$pkgrel")
-  options=('staticlibs')
 
   DESTDIR="$pkgdir" ninja -C build install-cxx
 
@@ -63,7 +62,6 @@ package_libc++ () {
 
 package_libc++abi() {
   pkgdesc="Low level support for the $pkgdesc"
-  options=('staticlibs')
 
   DESTDIR="$pkgdir" ninja -C build install-cxxabi
 



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

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


Reply via email to