[gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt-sanitizers/ - 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-sanitizers/
Date:	Fri, 23 Mar 2018 09:36:09
Message-Id:	`1521797755.0666cc02c2666d9b71559c92d3b8f0e95905cb10.mgorny@gentoo`

1

commit:     0666cc02c2666d9b71559c92d3b8f0e95905cb10

2

Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>

3

AuthorDate: Fri Mar 23 09:34:43 2018 +0000

4

Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>

5

CommitDate: Fri Mar 23 09:35:55 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0666cc02

7

8

sys-libs/compiler-rt-sanitizers: 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: e5afd9d0759d (sys-libs/compiler-rt-sanitizers: LLVM_SLOT -> ...)

16

17

 .../compiler-rt-sanitizers-4.0.1.ebuild            | 24 +++++++++++-----------

18

 .../compiler-rt-sanitizers-5.0.1.ebuild            | 24 +++++++++++-----------

19

 .../compiler-rt-sanitizers-6.0.0.ebuild            | 24 +++++++++++-----------

20

 .../compiler-rt-sanitizers-6.0.9999.ebuild         | 24 +++++++++++-----------

21

 .../compiler-rt-sanitizers-9999.ebuild             | 24 +++++++++++-----------

22

 5 files changed, 60 insertions(+), 60 deletions(-)

23

24

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild

25

index 632e36150de..2dc0d7cb40b 100644

26

--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild

27

+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild

28

@@ -21,7 +21,7 @@ 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-sanitizers-${SLOT}*:0"

35

 # llvm-4 needed for --cmakedir

36

 DEPEND="

37

@@ -30,7 +30,7 @@ DEPEND="

38

 	test? (

39

 		app-portage/unsandbox

40

 		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")

41

-		=sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}

42

+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}

43

 		sys-libs/compiler-rt:${SLOT} )

44

 	${PYTHON_DEPS}"

45

46

@@ -111,14 +111,14 @@ src_configure() {

47

 			-DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"

48

49

 			# they are created during src_test()

50

-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"

51

-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"

52

+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"

53

+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"

54

)

55

56

 		# same flags are passed for build & tests, so we need to strip

57

 		# them down to a subset supported by clang

58

-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \

59

-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \

60

+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \

61

+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \

62

 		strip-unsupported-flags

63

fi

64

65

@@ -131,17 +131,17 @@ src_configure() {

66

67

 		# copy clang over since resource_dir is located relatively to binary

68

 		# therefore, we can put our new libraries in it

69

-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die

70

-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \

71

-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die

72

+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die

73

+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \

74

+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die

75

 		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \

76

 			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die

77

 		cp "${sys_dir}"/*builtins*.a \

78

 			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die

79

 		# we also need LLVMgold.so for gold-based tests

80

-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then

81

-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \

82

-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die

83

+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then

84

+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \

85

+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die

86

fi

87

fi

88

}

89

90

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild

91

index db4e4d049b5..b09a0573d92 100644

92

--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild

93

+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild

94

@@ -23,7 +23,7 @@ SLOT="${PV%_*}"

95

 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"

96

 IUSE="+clang test elibc_glibc"

97

98

-LLVM_MAX_SLOT=${SLOT%%.*}

99

+CLANG_SLOT=${SLOT%%.*}

100

 # llvm-4 needed for --cmakedir

101

 DEPEND="

102

 	>=sys-devel/llvm-4

103

@@ -31,7 +31,7 @@ DEPEND="

104

 	test? (

105

 		app-portage/unsandbox

106

 		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")

107

-		=sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}

108

+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}

109

 		sys-libs/compiler-rt:${SLOT} )

110

 	${PYTHON_DEPS}"

111

112

@@ -115,14 +115,14 @@ src_configure() {

113

 			-DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"

114

115

 			# they are created during src_test()

116

-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"

117

-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"

118

+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"

119

+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"

120

)

121

122

 		# same flags are passed for build & tests, so we need to strip

123

 		# them down to a subset supported by clang

124

-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \

125

-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \

126

+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \

127

+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \

128

 		strip-unsupported-flags

129

fi

130

131

@@ -142,17 +142,17 @@ src_configure() {

132

133

 		# copy clang over since resource_dir is located relatively to binary

134

 		# therefore, we can put our new libraries in it

135

-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die

136

-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \

137

-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die

138

+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die

139

+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \

140

+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die

141

 		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \

142

 			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die

143

 		cp "${sys_dir}"/*builtins*.a \

144

 			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die

145

 		# we also need LLVMgold.so for gold-based tests

146

-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then

147

-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \

148

-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die

149

+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then

150

+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \

151

+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die

152

fi

153

fi

154

}

155

156

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild

157

index ca7cb14d19f..cb0a84d01c6 100644

158

--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild

159

+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild

160

@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86

161

 IUSE="+clang test elibc_glibc"

162

 RESTRICT="!test? ( test ) !clang? ( test )"

163

164

-LLVM_MAX_SLOT=${SLOT%%.*}

165

+CLANG_SLOT=${SLOT%%.*}

166

 # llvm-6 for new lit options

167

 DEPEND="

168

 	>=sys-devel/llvm-6

169

@@ -33,7 +33,7 @@ DEPEND="

170

 	test? (

171

 		!<sys-apps/sandbox-2.13

172

 		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")

173

-		=sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}

174

+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}

175

 		sys-libs/compiler-rt:${SLOT} )

176

 	${PYTHON_DEPS}"

177

178

@@ -116,14 +116,14 @@ src_configure() {

179

 			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"

180

181

 			# they are created during src_test()

182

-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"

183

-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"

184

+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"

185

+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"

186

)

187

188

 		# same flags are passed for build & tests, so we need to strip

189

 		# them down to a subset supported by clang

190

-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \

191

-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \

192

+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \

193

+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \

194

 		strip-unsupported-flags

195

fi

196

197

@@ -143,17 +143,17 @@ src_configure() {

198

199

 		# copy clang over since resource_dir is located relatively to binary

200

 		# therefore, we can put our new libraries in it

201

-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die

202

-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \

203

-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die

204

+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die

205

+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \

206

+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die

207

 		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \

208

 			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die

209

 		cp "${sys_dir}"/*builtins*.a \

210

 			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die

211

 		# we also need LLVMgold.so for gold-based tests

212

-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then

213

-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \

214

-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die

215

+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then

216

+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \

217

+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die

218

fi

219

fi

220

}

221

222

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild

223

index 52cda5eedce..c9bd5cbb582 100644

224

--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild

225

+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild

226

@@ -25,7 +25,7 @@ KEYWORDS=""

227

 IUSE="+clang test elibc_glibc"

228

 RESTRICT="!test? ( test ) !clang? ( test )"

229

230

-LLVM_MAX_SLOT=${SLOT%%.*}

231

+CLANG_SLOT=${SLOT%%.*}

232

 # llvm-6 for new lit options

233

 DEPEND="

234

 	>=sys-devel/llvm-6

235

@@ -33,7 +33,7 @@ DEPEND="

236

 	test? (

237

 		!<sys-apps/sandbox-2.13

238

 		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")

239

-		=sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}

240

+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}

241

 		sys-libs/compiler-rt:${SLOT} )

242

 	${PYTHON_DEPS}"

243

244

@@ -117,14 +117,14 @@ src_configure() {

245

 			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"

246

247

 			# they are created during src_test()

248

-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"

249

-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"

250

+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"

251

+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"

252

)

253

254

 		# same flags are passed for build & tests, so we need to strip

255

 		# them down to a subset supported by clang

256

-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \

257

-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \

258

+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \

259

+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \

260

 		strip-unsupported-flags

261

fi

262

263

@@ -144,17 +144,17 @@ src_configure() {

264

265

 		# copy clang over since resource_dir is located relatively to binary

266

 		# therefore, we can put our new libraries in it

267

-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die

268

-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \

269

-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die

270

+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die

271

+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \

272

+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die

273

 		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \

274

 			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die

275

 		cp "${sys_dir}"/*builtins*.a \

276

 			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die

277

 		# we also need LLVMgold.so for gold-based tests

278

-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then

279

-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \

280

-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die

281

+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then

282

+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \

283

+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die

284

fi

285

fi

286

}

287

288

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild

289

index b232680519b..8b127c7f41a 100644

290

--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild

291

+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild

292

@@ -24,7 +24,7 @@ KEYWORDS=""

293

 IUSE="+clang test elibc_glibc"

294

 RESTRICT="!test? ( test ) !clang? ( test )"

295

296

-LLVM_MAX_SLOT=${SLOT%%.*}

297

+CLANG_SLOT=${SLOT%%.*}

298

 # llvm-6 for new lit options

299

 DEPEND="

300

 	>=sys-devel/llvm-6

301

@@ -32,7 +32,7 @@ DEPEND="

302

 	test? (

303

 		!<sys-apps/sandbox-2.13

304

 		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")

305

-		=sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}

306

+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}

307

 		sys-libs/compiler-rt:${SLOT} )

308

 	${PYTHON_DEPS}"

309

310

@@ -116,14 +116,14 @@ src_configure() {

311

 			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"

312

313

 			# they are created during src_test()

314

-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"

315

-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"

316

+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"

317

+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"

318

)

319

320

 		# same flags are passed for build & tests, so we need to strip

321

 		# them down to a subset supported by clang

322

-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \

323

-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \

324

+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \

325

+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \

326

 		strip-unsupported-flags

327

fi

328

329

@@ -143,17 +143,17 @@ src_configure() {

330

331

 		# copy clang over since resource_dir is located relatively to binary

332

 		# therefore, we can put our new libraries in it

333

-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die

334

-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \

335

-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die

336

+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die

337

+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \

338

+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die

339

 		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \

340

 			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die

341

 		cp "${sys_dir}"/*builtins*.a \

342

 			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die

343

 		# we also need LLVMgold.so for gold-based tests

344

-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then

345

-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \

346

-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die

347

+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then

348

+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \

349

+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die

350

fi

351

fi

352

}

1	commit: 0666cc02c2666d9b71559c92d3b8f0e95905cb10
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Fri Mar 23 09:34:43 2018 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Fri Mar 23 09:35:55 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0666cc02
7
8	sys-libs/compiler-rt-sanitizers: 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: e5afd9d0759d (sys-libs/compiler-rt-sanitizers: LLVM_SLOT -> ...)
16
17	.../compiler-rt-sanitizers-4.0.1.ebuild \| 24 +++++++++++-----------
18	.../compiler-rt-sanitizers-5.0.1.ebuild \| 24 +++++++++++-----------
19	.../compiler-rt-sanitizers-6.0.0.ebuild \| 24 +++++++++++-----------
20	.../compiler-rt-sanitizers-6.0.9999.ebuild \| 24 +++++++++++-----------
21	.../compiler-rt-sanitizers-9999.ebuild \| 24 +++++++++++-----------
22	5 files changed, 60 insertions(+), 60 deletions(-)
23
24	diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
25	index 632e36150de..2dc0d7cb40b 100644
26	--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
27	+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
28	@@ -21,7 +21,7 @@ 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-sanitizers-${SLOT}*:0"
35	# llvm-4 needed for --cmakedir
36	DEPEND="
37	@@ -30,7 +30,7 @@ DEPEND="
38	test? (
39	app-portage/unsandbox
40	$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
41	- =sys-devel/clang-${PV%_}:${LLVM_MAX_SLOT}
42	+ =sys-devel/clang-${PV%_}:${CLANG_SLOT}
43	sys-libs/compiler-rt:${SLOT} )
44	${PYTHON_DEPS}"
45
46	@@ -111,14 +111,14 @@ src_configure() {
47	-DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"
48
49	# they are created during src_test()
50	- -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
51	- -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
52	+ -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
53	+ -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
54	)
55
56	# same flags are passed for build & tests, so we need to strip
57	# them down to a subset supported by clang
58	- CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
59	- CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
60	+ CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
61	+ CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
62	strip-unsupported-flags
63	fi
64
65	@@ -131,17 +131,17 @@ src_configure() {
66
67	# copy clang over since resource_dir is located relatively to binary
68	# therefore, we can put our new libraries in it
69	- mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} \|\| die
70	- cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
71	- "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ \|\| die
72	+ mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} \|\| die
73	+ cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
74	+ "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ \|\| die
75	cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
76	"${BUILD_DIR}"/lib/clang/${SLOT}/include/ \|\| die
77	cp "${sys_dir}"/builtins.a \
78	"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" \|\| die
79	# we also need LLVMgold.so for gold-based tests
80	- if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
81	- ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
82	- "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ \|\| die
83	+ if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
84	+ ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
85	+ "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ \|\| die
86	fi
87	fi
88	}
89
90	diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
91	index db4e4d049b5..b09a0573d92 100644
92	--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
93	+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
94	@@ -23,7 +23,7 @@ SLOT="${PV%_*}"
95	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
96	IUSE="+clang test elibc_glibc"
97
98	-LLVM_MAX_SLOT=${SLOT%%.*}
99	+CLANG_SLOT=${SLOT%%.*}
100	# llvm-4 needed for --cmakedir
101	DEPEND="
102	>=sys-devel/llvm-4
103	@@ -31,7 +31,7 @@ DEPEND="
104	test? (
105	app-portage/unsandbox
106	$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
107	- =sys-devel/clang-${PV%_}:${LLVM_MAX_SLOT}
108	+ =sys-devel/clang-${PV%_}:${CLANG_SLOT}
109	sys-libs/compiler-rt:${SLOT} )
110	${PYTHON_DEPS}"
111
112	@@ -115,14 +115,14 @@ src_configure() {
113	-DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"
114
115	# they are created during src_test()
116	- -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
117	- -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
118	+ -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
119	+ -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
120	)
121
122	# same flags are passed for build & tests, so we need to strip
123	# them down to a subset supported by clang
124	- CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
125	- CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
126	+ CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
127	+ CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
128	strip-unsupported-flags
129	fi
130
131	@@ -142,17 +142,17 @@ src_configure() {
132
133	# copy clang over since resource_dir is located relatively to binary
134	# therefore, we can put our new libraries in it
135	- mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} \|\| die
136	- cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
137	- "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ \|\| die
138	+ mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} \|\| die
139	+ cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
140	+ "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ \|\| die
141	cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
142	"${BUILD_DIR}"/lib/clang/${SLOT}/include/ \|\| die
143	cp "${sys_dir}"/builtins.a \
144	"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" \|\| die
145	# we also need LLVMgold.so for gold-based tests
146	- if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
147	- ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
148	- "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ \|\| die
149	+ if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
150	+ ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
151	+ "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ \|\| die
152	fi
153	fi
154	}
155
156	diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
157	index ca7cb14d19f..cb0a84d01c6 100644
158	--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
159	+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
160	@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86
161	IUSE="+clang test elibc_glibc"
162	RESTRICT="!test? ( test ) !clang? ( test )"
163
164	-LLVM_MAX_SLOT=${SLOT%%.*}
165	+CLANG_SLOT=${SLOT%%.*}
166	# llvm-6 for new lit options
167	DEPEND="
168	>=sys-devel/llvm-6
169	@@ -33,7 +33,7 @@ DEPEND="
170	test? (
171	!<sys-apps/sandbox-2.13
172	$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
173	- =sys-devel/clang-${PV%_}:${LLVM_MAX_SLOT}
174	+ =sys-devel/clang-${PV%_}:${CLANG_SLOT}
175	sys-libs/compiler-rt:${SLOT} )
176	${PYTHON_DEPS}"
177
178	@@ -116,14 +116,14 @@ src_configure() {
179	-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
180
181	# they are created during src_test()
182	- -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
183	- -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
184	+ -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
185	+ -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
186	)
187
188	# same flags are passed for build & tests, so we need to strip
189	# them down to a subset supported by clang
190	- CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
191	- CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
192	+ CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
193	+ CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
194	strip-unsupported-flags
195	fi
196
197	@@ -143,17 +143,17 @@ src_configure() {
198
199	# copy clang over since resource_dir is located relatively to binary
200	# therefore, we can put our new libraries in it
201	- mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} \|\| die
202	- cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
203	- "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ \|\| die
204	+ mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} \|\| die
205	+ cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
206	+ "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ \|\| die
207	cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
208	"${BUILD_DIR}"/lib/clang/${SLOT}/include/ \|\| die
209	cp "${sys_dir}"/builtins.a \
210	"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" \|\| die
211	# we also need LLVMgold.so for gold-based tests
212	- if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
213	- ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
214	- "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ \|\| die
215	+ if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
216	+ ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
217	+ "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ \|\| die
218	fi
219	fi
220	}
221
222	diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild
223	index 52cda5eedce..c9bd5cbb582 100644
224	--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild
225	+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild
226	@@ -25,7 +25,7 @@ KEYWORDS=""
227	IUSE="+clang test elibc_glibc"
228	RESTRICT="!test? ( test ) !clang? ( test )"
229
230	-LLVM_MAX_SLOT=${SLOT%%.*}
231	+CLANG_SLOT=${SLOT%%.*}
232	# llvm-6 for new lit options
233	DEPEND="
234	>=sys-devel/llvm-6
235	@@ -33,7 +33,7 @@ DEPEND="
236	test? (
237	!<sys-apps/sandbox-2.13
238	$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
239	- =sys-devel/clang-${PV%_}:${LLVM_MAX_SLOT}
240	+ =sys-devel/clang-${PV%_}:${CLANG_SLOT}
241	sys-libs/compiler-rt:${SLOT} )
242	${PYTHON_DEPS}"
243
244	@@ -117,14 +117,14 @@ src_configure() {
245	-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
246
247	# they are created during src_test()
248	- -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
249	- -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
250	+ -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
251	+ -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
252	)
253
254	# same flags are passed for build & tests, so we need to strip
255	# them down to a subset supported by clang
256	- CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
257	- CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
258	+ CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
259	+ CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
260	strip-unsupported-flags
261	fi
262
263	@@ -144,17 +144,17 @@ src_configure() {
264
265	# copy clang over since resource_dir is located relatively to binary
266	# therefore, we can put our new libraries in it
267	- mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} \|\| die
268	- cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
269	- "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ \|\| die
270	+ mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} \|\| die
271	+ cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
272	+ "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ \|\| die
273	cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
274	"${BUILD_DIR}"/lib/clang/${SLOT}/include/ \|\| die
275	cp "${sys_dir}"/builtins.a \
276	"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" \|\| die
277	# we also need LLVMgold.so for gold-based tests
278	- if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
279	- ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
280	- "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ \|\| die
281	+ if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
282	+ ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
283	+ "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ \|\| die
284	fi
285	fi
286	}
287
288	diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
289	index b232680519b..8b127c7f41a 100644
290	--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
291	+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
292	@@ -24,7 +24,7 @@ KEYWORDS=""
293	IUSE="+clang test elibc_glibc"
294	RESTRICT="!test? ( test ) !clang? ( test )"
295
296	-LLVM_MAX_SLOT=${SLOT%%.*}
297	+CLANG_SLOT=${SLOT%%.*}
298	# llvm-6 for new lit options
299	DEPEND="
300	>=sys-devel/llvm-6
301	@@ -32,7 +32,7 @@ DEPEND="
302	test? (
303	!<sys-apps/sandbox-2.13
304	$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
305	- =sys-devel/clang-${PV%_}:${LLVM_MAX_SLOT}
306	+ =sys-devel/clang-${PV%_}:${CLANG_SLOT}
307	sys-libs/compiler-rt:${SLOT} )
308	${PYTHON_DEPS}"
309
310	@@ -116,14 +116,14 @@ src_configure() {
311	-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
312
313	# they are created during src_test()
314	- -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
315	- -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
316	+ -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
317	+ -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
318	)
319
320	# same flags are passed for build & tests, so we need to strip
321	# them down to a subset supported by clang
322	- CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
323	- CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
324	+ CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
325	+ CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
326	strip-unsupported-flags
327	fi
328
329	@@ -143,17 +143,17 @@ src_configure() {
330
331	# copy clang over since resource_dir is located relatively to binary
332	# therefore, we can put our new libraries in it
333	- mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} \|\| die
334	- cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
335	- "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ \|\| die
336	+ mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} \|\| die
337	+ cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
338	+ "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ \|\| die
339	cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
340	"${BUILD_DIR}"/lib/clang/${SLOT}/include/ \|\| die
341	cp "${sys_dir}"/builtins.a \
342	"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" \|\| die
343	# we also need LLVMgold.so for gold-based tests
344	- if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
345	- ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
346	- "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ \|\| die
347	+ if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
348	+ ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
349	+ "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ \|\| die
350	fi
351	fi
352	}

Gentoo Archives: gentoo-commits