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

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/compiler-rt/
Date: Fri, 23 Mar 2018 09:36:09
Message-Id: 1521797754.682b9c2a05fd86ba79a916d151c3029ecb779d92.mgorny@gentoo
1 commit: 682b9c2a05fd86ba79a916d151c3029ecb779d92
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 23 09:32:04 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 23 09:35:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682b9c2a
7
8 sys-libs/compiler-rt: Fix LLVM_MAX_SLOT -> CLANG_SLOT
9
10 The variable was intentionally chosen not to use the eclass, and its
11 my mistake of conflating the two. Name it CLANG_SLOT to make it look
12 more purposeful.
13
14 Closes: https://bugs.gentoo.org/650750
15 Fixes: ade5b255f1e8 (sys-libs/compiler-rt: fix eclass use by LLVM_SLOT...)
16
17 sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild | 12 ++++++------
18 sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild | 8 ++++----
19 sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild | 8 ++++----
20 sys-libs/compiler-rt/compiler-rt-6.0.9999.ebuild | 8 ++++----
21 sys-libs/compiler-rt/compiler-rt-9999.ebuild | 8 ++++----
22 5 files changed, 22 insertions(+), 22 deletions(-)
23
24 diff --git a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
25 index f7a4ef2ed66..bb00a9d93c6 100644
26 --- a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
27 +++ b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
28 @@ -20,13 +20,13 @@ SLOT="${PV%_*}"
29 KEYWORDS="amd64 ~arm64 x86"
30 IUSE="+clang test"
31
32 -LLVM_MAX_SLOT=${SLOT%%.*}
33 +CLANG_SLOT=${SLOT%%.*}
34 RDEPEND="!=sys-libs/compiler-rt-${SLOT}*:0"
35 # llvm-4 needed for --cmakedir
36 DEPEND="
37 >=sys-devel/llvm-4
38 clang? ( sys-devel/clang )
39 - test? ( =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} )
40 + test? ( =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
41 ${PYTHON_DEPS}"
42
43 S=${WORKDIR}/${P/_/}.src
44 @@ -88,9 +88,9 @@ src_test() {
45 # prepare a test compiler
46 # copy clang over since resource_dir is located relatively to binary
47 # therefore, we can put our new libraries in it
48 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}{/bin,$(get_libdir)},clang/${SLOT}/include} || die
49 - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
50 - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
51 + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}{/bin,$(get_libdir)},clang/${SLOT}/include} || die
52 + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
53 + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
54 cp "${EPREFIX}/usr/lib/clang/${SLOT}/include"/*.h \
55 "${BUILD_DIR}/lib/clang/${SLOT}/include/" || die
56
57 @@ -128,7 +128,7 @@ src_test() {
58 einfo "Running tests for ABI=${ABI}"
59 # use -k to run all tests even if some fail
60 emake -k \
61 - CC="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" \
62 + CC="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" \
63 CFLAGS="$(get_abi_CFLAGS)" \
64 CPPFLAGS='-I../../../lib/builtins' \
65 LDFLAGS='-rtlib=compiler-rt' \
66
67 diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
68 index 241fc11bd3a..b4861d13427 100644
69 --- a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
70 +++ b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
71 @@ -19,14 +19,14 @@ SLOT="${PV%_*}"
72 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
73 IUSE="+clang test"
74
75 -LLVM_MAX_SLOT=${SLOT%%.*}
76 +CLANG_SLOT=${SLOT%%.*}
77 # llvm-4 needed for --cmakedir
78 DEPEND="
79 >=sys-devel/llvm-4
80 clang? ( sys-devel/clang )
81 test? (
82 $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
83 - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} )
84 + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
85 ${PYTHON_DEPS}"
86
87 S=${WORKDIR}/${P/_/}.src
88 @@ -88,8 +88,8 @@ src_configure() {
89 mycmakeargs+=(
90 -DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
91
92 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
93 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
94 + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
95 + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
96 )
97 fi
98
99
100 diff --git a/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild
101 index 44dd01ced40..5292e752c06 100644
102 --- a/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild
103 +++ b/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild
104 @@ -21,14 +21,14 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86
105 IUSE="+clang test"
106 RESTRICT="!test? ( test ) !clang? ( test )"
107
108 -LLVM_MAX_SLOT=${SLOT%%.*}
109 +CLANG_SLOT=${SLOT%%.*}
110 # llvm-6 for new lit options
111 DEPEND="
112 >=sys-devel/llvm-6
113 clang? ( sys-devel/clang )
114 test? (
115 $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
116 - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} )
117 + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
118 ${PYTHON_DEPS}"
119
120 S=${WORKDIR}/${P/_/}.src
121 @@ -93,8 +93,8 @@ src_configure() {
122 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
123 -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
124
125 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
126 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
127 + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
128 + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
129 )
130 fi
131
132
133 diff --git a/sys-libs/compiler-rt/compiler-rt-6.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-6.0.9999.ebuild
134 index 2542708841a..74f0dac70c6 100644
135 --- a/sys-libs/compiler-rt/compiler-rt-6.0.9999.ebuild
136 +++ b/sys-libs/compiler-rt/compiler-rt-6.0.9999.ebuild
137 @@ -25,14 +25,14 @@ KEYWORDS=""
138 IUSE="+clang test"
139 RESTRICT="!test? ( test ) !clang? ( test )"
140
141 -LLVM_MAX_SLOT=${SLOT%%.*}
142 +CLANG_SLOT=${SLOT%%.*}
143 # llvm-6 for new lit options
144 DEPEND="
145 >=sys-devel/llvm-6
146 clang? ( sys-devel/clang )
147 test? (
148 $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
149 - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} )
150 + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
151 ${PYTHON_DEPS}"
152
153 # least intrusive of all
154 @@ -95,8 +95,8 @@ src_configure() {
155 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
156 -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
157
158 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
159 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
160 + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
161 + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
162 )
163 fi
164
165
166 diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
167 index b6a339768aa..7a956b544df 100644
168 --- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild
169 +++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
170 @@ -24,14 +24,14 @@ KEYWORDS=""
171 IUSE="+clang test"
172 RESTRICT="!test? ( test ) !clang? ( test )"
173
174 -LLVM_MAX_SLOT=${SLOT%%.*}
175 +CLANG_SLOT=${SLOT%%.*}
176 # llvm-6 for new lit options
177 DEPEND="
178 >=sys-devel/llvm-6
179 clang? ( sys-devel/clang )
180 test? (
181 $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
182 - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} )
183 + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
184 ${PYTHON_DEPS}"
185
186 # least intrusive of all
187 @@ -94,8 +94,8 @@ src_configure() {
188 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
189 -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
190
191 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
192 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
193 + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
194 + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
195 )
196 fi
Report Message
Find on MARC Find on Google Groups