Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/llvm-libunwind/
Date: Wed, 01 Dec 2021 16:47:32
Message-Id: 1638377244.a2e2309a6851200acea35fe0bd9040dbde507fa9.mgorny@gentoo
1 commit: a2e2309a6851200acea35fe0bd9040dbde507fa9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 1 16:39:32 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 1 16:47:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e2309a
7
8 sys-libs/llvm-libunwind: Set target triple unconditionally
9
10 While this is not strictly required for this package,
11 set LIBUNWIND_TARGET_TRIPLE unconditionally for consistency with libc++
12 and libc++abi.
13
14 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
15
16 sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild | 2 +-
17 sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.9999.ebuild | 2 +-
18 sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild | 2 +-
19 sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild | 2 +-
20 4 files changed, 4 insertions(+), 4 deletions(-)
21
22 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild
23 index 7878ad2cc3f1..607404341462 100644
24 --- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild
25 +++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild
26 @@ -55,6 +55,7 @@ multilib_src_configure() {
27 -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
28 -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
29 -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
30 + -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
31 -DLLVM_INCLUDE_TESTS=$(usex test)
32
33 # support non-native unwinding; given it's small enough,
34 @@ -72,7 +73,6 @@ multilib_src_configure() {
35 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
36 -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
37 -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
38 - -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
39 )
40 fi
41
42
43 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.9999.ebuild
44 index c16a58ffa99e..b2e400ff295b 100644
45 --- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.9999.ebuild
46 +++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.9999.ebuild
47 @@ -55,6 +55,7 @@ multilib_src_configure() {
48 -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
49 -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
50 -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
51 + -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
52 -DLLVM_INCLUDE_TESTS=$(usex test)
53
54 # support non-native unwinding; given it's small enough,
55 @@ -72,7 +73,6 @@ multilib_src_configure() {
56 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
57 -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
58 -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
59 - -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
60 )
61 fi
62
63
64 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild
65 index c16a58ffa99e..b2e400ff295b 100644
66 --- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild
67 +++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild
68 @@ -55,6 +55,7 @@ multilib_src_configure() {
69 -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
70 -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
71 -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
72 + -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
73 -DLLVM_INCLUDE_TESTS=$(usex test)
74
75 # support non-native unwinding; given it's small enough,
76 @@ -72,7 +73,6 @@ multilib_src_configure() {
77 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
78 -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
79 -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
80 - -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
81 )
82 fi
83
84
85 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
86 index c16a58ffa99e..b2e400ff295b 100644
87 --- a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
88 +++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
89 @@ -55,6 +55,7 @@ multilib_src_configure() {
90 -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
91 -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
92 -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
93 + -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
94 -DLLVM_INCLUDE_TESTS=$(usex test)
95
96 # support non-native unwinding; given it's small enough,
97 @@ -72,7 +73,6 @@ multilib_src_configure() {
98 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
99 -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
100 -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
101 - -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
102 )
103 fi