Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 13/18] sys-libs/compiler-rt: Dedupe with new eclass code
Date: Sat, 20 Jun 2020 21:21:24
Message-Id: 20200620211624.427466-14-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/18] llvm.org.eclass: more deduplication with packages by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 .../compiler-rt/compiler-rt-10.0.1.9999.ebuild | 15 ++-------------
4 .../compiler-rt/compiler-rt-10.0.1_rc1.ebuild | 15 ++-------------
5 .../compiler-rt/compiler-rt-11.0.0.9999.ebuild | 15 ++-------------
6 3 files changed, 6 insertions(+), 39 deletions(-)
7
8 diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
9 index 422f3ce2cf4d..c83c56ecf249 100644
10 --- a/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
11 +++ b/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
12 @@ -4,8 +4,7 @@
13 EAPI=7
14
15 PYTHON_COMPAT=( python3_{6..9} )
16 -inherit cmake flag-o-matic llvm llvm.org multiprocessing \
17 - python-any-r1 toolchain-funcs
18 +inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
19
20 DESCRIPTION="Compiler runtime library for clang (built-in part)"
21 HOMEPAGE="https://llvm.org/"
22 @@ -29,9 +28,6 @@ BDEPEND="
23 =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
24 ${PYTHON_DEPS}"
25
26 -# least intrusive of all
27 -CMAKE_BUILD_TYPE=RelWithDebInfo
28 -
29 python_check_deps() {
30 use test || return 0
31 has_version "dev-python/lit[${PYTHON_USEDEP}]"
32 @@ -49,13 +45,6 @@ pkg_setup() {
33 python-any-r1_pkg_setup
34 }
35
36 -src_prepare() {
37 - # cmake eclasses suck by forcing ${S} here
38 - CMAKE_USE_DIR=${S} \
39 - S=${WORKDIR} \
40 - cmake_src_prepare
41 -}
42 -
43 test_compiler() {
44 $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
45 <<<'int main() { return 0; }' &>/dev/null
46 @@ -99,7 +88,7 @@ src_configure() {
47 if use test; then
48 mycmakeargs+=(
49 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
50 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
51 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
52
53 -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
54 -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
55 diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
56 index 422f3ce2cf4d..c83c56ecf249 100644
57 --- a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
58 +++ b/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
59 @@ -4,8 +4,7 @@
60 EAPI=7
61
62 PYTHON_COMPAT=( python3_{6..9} )
63 -inherit cmake flag-o-matic llvm llvm.org multiprocessing \
64 - python-any-r1 toolchain-funcs
65 +inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
66
67 DESCRIPTION="Compiler runtime library for clang (built-in part)"
68 HOMEPAGE="https://llvm.org/"
69 @@ -29,9 +28,6 @@ BDEPEND="
70 =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
71 ${PYTHON_DEPS}"
72
73 -# least intrusive of all
74 -CMAKE_BUILD_TYPE=RelWithDebInfo
75 -
76 python_check_deps() {
77 use test || return 0
78 has_version "dev-python/lit[${PYTHON_USEDEP}]"
79 @@ -49,13 +45,6 @@ pkg_setup() {
80 python-any-r1_pkg_setup
81 }
82
83 -src_prepare() {
84 - # cmake eclasses suck by forcing ${S} here
85 - CMAKE_USE_DIR=${S} \
86 - S=${WORKDIR} \
87 - cmake_src_prepare
88 -}
89 -
90 test_compiler() {
91 $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
92 <<<'int main() { return 0; }' &>/dev/null
93 @@ -99,7 +88,7 @@ src_configure() {
94 if use test; then
95 mycmakeargs+=(
96 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
97 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
98 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
99
100 -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
101 -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
102 diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
103 index 422f3ce2cf4d..c83c56ecf249 100644
104 --- a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
105 +++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
106 @@ -4,8 +4,7 @@
107 EAPI=7
108
109 PYTHON_COMPAT=( python3_{6..9} )
110 -inherit cmake flag-o-matic llvm llvm.org multiprocessing \
111 - python-any-r1 toolchain-funcs
112 +inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
113
114 DESCRIPTION="Compiler runtime library for clang (built-in part)"
115 HOMEPAGE="https://llvm.org/"
116 @@ -29,9 +28,6 @@ BDEPEND="
117 =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
118 ${PYTHON_DEPS}"
119
120 -# least intrusive of all
121 -CMAKE_BUILD_TYPE=RelWithDebInfo
122 -
123 python_check_deps() {
124 use test || return 0
125 has_version "dev-python/lit[${PYTHON_USEDEP}]"
126 @@ -49,13 +45,6 @@ pkg_setup() {
127 python-any-r1_pkg_setup
128 }
129
130 -src_prepare() {
131 - # cmake eclasses suck by forcing ${S} here
132 - CMAKE_USE_DIR=${S} \
133 - S=${WORKDIR} \
134 - cmake_src_prepare
135 -}
136 -
137 test_compiler() {
138 $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
139 <<<'int main() { return 0; }' &>/dev/null
140 @@ -99,7 +88,7 @@ src_configure() {
141 if use test; then
142 mycmakeargs+=(
143 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
144 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
145 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
146
147 -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
148 -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
149 --
150 2.27.0
Report Message
Find on MARC Find on Google Groups