[gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/, profiles/features/prefix/standalone/ - gentoo-commits

From:	James Le Cuirot <chewi@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/, profiles/features/prefix/standalone/
Date:	Sat, 28 Jan 2023 22:12:28
Message-Id:	`1674943883.28edf4f989f28e2c9e698462f693f8f6b58eaa19.chewi@gentoo`

1

commit:     28edf4f989f28e2c9e698462f693f8f6b58eaa19

2

Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>

3

AuthorDate: Sat Jan  7 15:44:32 2023 +0000

4

Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>

5

CommitDate: Sat Jan 28 22:11:23 2023 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28edf4f9

7

8

sys-devel/clang: Move clang prefix tweaks from profile

9

10

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

11

12

 profiles/features/prefix/standalone/profile.bashrc | 11 +----------

13

 sys-devel/clang/clang-13.0.1.ebuild                |  5 +++++

14

 sys-devel/clang/clang-14.0.6-r1.ebuild             |  5 +++++

15

 sys-devel/clang/clang-15.0.7-r1.ebuild             |  5 +++++

16

 sys-devel/clang/clang-16.0.0.9999.ebuild           |  5 +++++

17

 sys-devel/clang/clang-16.0.0_pre20230107.ebuild    |  5 +++++

18

 sys-devel/clang/clang-16.0.0_pre20230127.ebuild    |  5 +++++

19

 sys-devel/clang/clang-17.0.0.9999.ebuild           |  5 +++++

20

 8 files changed, 36 insertions(+), 10 deletions(-)

21

22

diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc

23

index 57ec4b57abcb..d46933210dcc 100644

24

--- a/profiles/features/prefix/standalone/profile.bashrc

25

+++ b/profiles/features/prefix/standalone/profile.bashrc

26

@@ -9,16 +9,7 @@

27

 # Disable RAP trick during bootstrap stage2

28

 [[ -z ${BOOTSTRAP_RAP_STAGE2} ]] || return 0

29

30

-if [[ ${CATEGORY}/${PN} == sys-devel/clang && ${EBUILD_PHASE} == configure ]]; then

31

-    ebegin "Use ${EPREFIX} as default sysroot"

32

-    sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" "${S}"/CMakeLists.txt

33

-    eend $?

34

-    pushd "${S}/lib/Driver/ToolChains" >/dev/null

35

-    ebegin "Use dynamic linker from ${EPREFIX}"

36

-    sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX%/}/\"@" Linux.cpp

37

-    eend $?

38

-    popd >/dev/null

39

-elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then

40

+if [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then

41

     ebegin "Prefixifying native library path"

42

     sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \

43

 	"${S}"/ld/configure.tgt

44

45

diff --git a/sys-devel/clang/clang-13.0.1.ebuild b/sys-devel/clang/clang-13.0.1.ebuild

46

index 5e10d595d900..c3a97feedae7 100644

47

--- a/sys-devel/clang/clang-13.0.1.ebuild

48

+++ b/sys-devel/clang/clang-13.0.1.ebuild

49

@@ -82,6 +82,10 @@ src_prepare() {

50

 	eprefixify \

51

 		lib/Frontend/InitHeaderSearch.cpp \

52

 		lib/Driver/ToolChains/Darwin.cpp || die

53

+

54

+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then

55

+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die

56

+	fi

57

}

58

59

 check_distribution_components() {

60

@@ -224,6 +228,7 @@ multilib_src_configure() {

61

 	local clang_version=$(ver_cut 1-3 "${llvm_version}")

62

63

 	local mycmakeargs=(

64

+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")

65

 		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"

66

 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"

67

 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"

68

69

diff --git a/sys-devel/clang/clang-14.0.6-r1.ebuild b/sys-devel/clang/clang-14.0.6-r1.ebuild

70

index de10ab36054f..5cdb584470ac 100644

71

--- a/sys-devel/clang/clang-14.0.6-r1.ebuild

72

+++ b/sys-devel/clang/clang-14.0.6-r1.ebuild

73

@@ -95,6 +95,10 @@ src_prepare() {

74

 	eprefixify \

75

 		lib/Lex/InitHeaderSearch.cpp \

76

 		lib/Driver/ToolChains/Darwin.cpp || die

77

+

78

+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then

79

+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die

80

+	fi

81

}

82

83

 check_distribution_components() {

84

@@ -234,6 +238,7 @@ multilib_src_configure() {

85

 	local clang_version=$(ver_cut 1-3 "${llvm_version}")

86

87

 	local mycmakeargs=(

88

+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")

89

 		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"

90

 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"

91

 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"

92

93

diff --git a/sys-devel/clang/clang-15.0.7-r1.ebuild b/sys-devel/clang/clang-15.0.7-r1.ebuild

94

index b7b9a4e0a274..578c01ab0ea2 100644

95

--- a/sys-devel/clang/clang-15.0.7-r1.ebuild

96

+++ b/sys-devel/clang/clang-15.0.7-r1.ebuild

97

@@ -86,6 +86,10 @@ src_prepare() {

98

 	eprefixify \

99

 		lib/Lex/InitHeaderSearch.cpp \

100

 		lib/Driver/ToolChains/Darwin.cpp || die

101

+

102

+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then

103

+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die

104

+	fi

105

}

106

107

 check_distribution_components() {

108

@@ -249,6 +253,7 @@ get_distribution_components() {

109

110

 multilib_src_configure() {

111

 	local mycmakeargs=(

112

+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")

113

 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"

114

 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"

115

 		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"

116

117

diff --git a/sys-devel/clang/clang-16.0.0.9999.ebuild b/sys-devel/clang/clang-16.0.0.9999.ebuild

118

index 4979e95cd523..b45257440e78 100644

119

--- a/sys-devel/clang/clang-16.0.0.9999.ebuild

120

+++ b/sys-devel/clang/clang-16.0.0.9999.ebuild

121

@@ -85,6 +85,10 @@ src_prepare() {

122

 	eprefixify \

123

 		lib/Lex/InitHeaderSearch.cpp \

124

 		lib/Driver/ToolChains/Darwin.cpp || die

125

+

126

+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then

127

+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die

128

+	fi

129

}

130

131

 check_distribution_components() {

132

@@ -250,6 +254,7 @@ get_distribution_components() {

133

134

 multilib_src_configure() {

135

 	local mycmakeargs=(

136

+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")

137

 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"

138

 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"

139

 		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"

140

141

diff --git a/sys-devel/clang/clang-16.0.0_pre20230107.ebuild b/sys-devel/clang/clang-16.0.0_pre20230107.ebuild

142

index f8a5211642c1..f6e6fd239ce2 100644

143

--- a/sys-devel/clang/clang-16.0.0_pre20230107.ebuild

144

+++ b/sys-devel/clang/clang-16.0.0_pre20230107.ebuild

145

@@ -85,6 +85,10 @@ src_prepare() {

146

 	eprefixify \

147

 		lib/Lex/InitHeaderSearch.cpp \

148

 		lib/Driver/ToolChains/Darwin.cpp || die

149

+

150

+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then

151

+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die

152

+	fi

153

}

154

155

 check_distribution_components() {

156

@@ -248,6 +252,7 @@ get_distribution_components() {

157

158

 multilib_src_configure() {

159

 	local mycmakeargs=(

160

+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")

161

 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"

162

 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"

163

 		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"

164

165

diff --git a/sys-devel/clang/clang-16.0.0_pre20230127.ebuild b/sys-devel/clang/clang-16.0.0_pre20230127.ebuild

166

index 4979e95cd523..b45257440e78 100644

167

--- a/sys-devel/clang/clang-16.0.0_pre20230127.ebuild

168

+++ b/sys-devel/clang/clang-16.0.0_pre20230127.ebuild

169

@@ -85,6 +85,10 @@ src_prepare() {

170

 	eprefixify \

171

 		lib/Lex/InitHeaderSearch.cpp \

172

 		lib/Driver/ToolChains/Darwin.cpp || die

173

+

174

+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then

175

+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die

176

+	fi

177

}

178

179

 check_distribution_components() {

180

@@ -250,6 +254,7 @@ get_distribution_components() {

181

182

 multilib_src_configure() {

183

 	local mycmakeargs=(

184

+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")

185

 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"

186

 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"

187

 		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"

188

189

diff --git a/sys-devel/clang/clang-17.0.0.9999.ebuild b/sys-devel/clang/clang-17.0.0.9999.ebuild

190

index 4979e95cd523..b45257440e78 100644

191

--- a/sys-devel/clang/clang-17.0.0.9999.ebuild

192

+++ b/sys-devel/clang/clang-17.0.0.9999.ebuild

193

@@ -85,6 +85,10 @@ src_prepare() {

194

 	eprefixify \

195

 		lib/Lex/InitHeaderSearch.cpp \

196

 		lib/Driver/ToolChains/Darwin.cpp || die

197

+

198

+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then

199

+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die

200

+	fi

201

}

202

203

 check_distribution_components() {

204

@@ -250,6 +254,7 @@ get_distribution_components() {

205

206

 multilib_src_configure() {

207

 	local mycmakeargs=(

208

+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")

209

 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"

210

 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"

211

 		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"

1	commit: 28edf4f989f28e2c9e698462f693f8f6b58eaa19
2	Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3	AuthorDate: Sat Jan 7 15:44:32 2023 +0000
4	Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5	CommitDate: Sat Jan 28 22:11:23 2023 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28edf4f9
7
8	sys-devel/clang: Move clang prefix tweaks from profile
9
10	Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
11
12	profiles/features/prefix/standalone/profile.bashrc \| 11 +----------
13	sys-devel/clang/clang-13.0.1.ebuild \| 5 +++++
14	sys-devel/clang/clang-14.0.6-r1.ebuild \| 5 +++++
15	sys-devel/clang/clang-15.0.7-r1.ebuild \| 5 +++++
16	sys-devel/clang/clang-16.0.0.9999.ebuild \| 5 +++++
17	sys-devel/clang/clang-16.0.0_pre20230107.ebuild \| 5 +++++
18	sys-devel/clang/clang-16.0.0_pre20230127.ebuild \| 5 +++++
19	sys-devel/clang/clang-17.0.0.9999.ebuild \| 5 +++++
20	8 files changed, 36 insertions(+), 10 deletions(-)
21
22	diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc
23	index 57ec4b57abcb..d46933210dcc 100644
24	--- a/profiles/features/prefix/standalone/profile.bashrc
25	+++ b/profiles/features/prefix/standalone/profile.bashrc
26	@@ -9,16 +9,7 @@
27	# Disable RAP trick during bootstrap stage2
28	[[ -z ${BOOTSTRAP_RAP_STAGE2} ]] \|\| return 0
29
30	-if [[ ${CATEGORY}/${PN} == sys-devel/clang && ${EBUILD_PHASE} == configure ]]; then
31	- ebegin "Use ${EPREFIX} as default sysroot"
32	- sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" "${S}"/CMakeLists.txt
33	- eend $?
34	- pushd "${S}/lib/Driver/ToolChains" >/dev/null
35	- ebegin "Use dynamic linker from ${EPREFIX}"
36	- sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX%/}/\"@" Linux.cpp
37	- eend $?
38	- popd >/dev/null
39	-elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then
40	+if [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then
41	ebegin "Prefixifying native library path"
42	sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local\|)\|)/lib),${EPREFIX}\1,g" \
43	"${S}"/ld/configure.tgt
44
45	diff --git a/sys-devel/clang/clang-13.0.1.ebuild b/sys-devel/clang/clang-13.0.1.ebuild
46	index 5e10d595d900..c3a97feedae7 100644
47	--- a/sys-devel/clang/clang-13.0.1.ebuild
48	+++ b/sys-devel/clang/clang-13.0.1.ebuild
49	@@ -82,6 +82,10 @@ src_prepare() {
50	eprefixify \
51	lib/Frontend/InitHeaderSearch.cpp \
52	lib/Driver/ToolChains/Darwin.cpp \|\| die
53	+
54	+ if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
55	+ sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp \|\| die
56	+ fi
57	}
58
59	check_distribution_components() {
60	@@ -224,6 +228,7 @@ multilib_src_configure() {
61	local clang_version=$(ver_cut 1-3 "${llvm_version}")
62
63	local mycmakeargs=(
64	+ -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
65	-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
66	-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
67	-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
68
69	diff --git a/sys-devel/clang/clang-14.0.6-r1.ebuild b/sys-devel/clang/clang-14.0.6-r1.ebuild
70	index de10ab36054f..5cdb584470ac 100644
71	--- a/sys-devel/clang/clang-14.0.6-r1.ebuild
72	+++ b/sys-devel/clang/clang-14.0.6-r1.ebuild
73	@@ -95,6 +95,10 @@ src_prepare() {
74	eprefixify \
75	lib/Lex/InitHeaderSearch.cpp \
76	lib/Driver/ToolChains/Darwin.cpp \|\| die
77	+
78	+ if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
79	+ sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp \|\| die
80	+ fi
81	}
82
83	check_distribution_components() {
84	@@ -234,6 +238,7 @@ multilib_src_configure() {
85	local clang_version=$(ver_cut 1-3 "${llvm_version}")
86
87	local mycmakeargs=(
88	+ -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
89	-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
90	-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
91	-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
92
93	diff --git a/sys-devel/clang/clang-15.0.7-r1.ebuild b/sys-devel/clang/clang-15.0.7-r1.ebuild
94	index b7b9a4e0a274..578c01ab0ea2 100644
95	--- a/sys-devel/clang/clang-15.0.7-r1.ebuild
96	+++ b/sys-devel/clang/clang-15.0.7-r1.ebuild
97	@@ -86,6 +86,10 @@ src_prepare() {
98	eprefixify \
99	lib/Lex/InitHeaderSearch.cpp \
100	lib/Driver/ToolChains/Darwin.cpp \|\| die
101	+
102	+ if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
103	+ sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp \|\| die
104	+ fi
105	}
106
107	check_distribution_components() {
108	@@ -249,6 +253,7 @@ get_distribution_components() {
109
110	multilib_src_configure() {
111	local mycmakeargs=(
112	+ -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
113	-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
114	-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
115	-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
116
117	diff --git a/sys-devel/clang/clang-16.0.0.9999.ebuild b/sys-devel/clang/clang-16.0.0.9999.ebuild
118	index 4979e95cd523..b45257440e78 100644
119	--- a/sys-devel/clang/clang-16.0.0.9999.ebuild
120	+++ b/sys-devel/clang/clang-16.0.0.9999.ebuild
121	@@ -85,6 +85,10 @@ src_prepare() {
122	eprefixify \
123	lib/Lex/InitHeaderSearch.cpp \
124	lib/Driver/ToolChains/Darwin.cpp \|\| die
125	+
126	+ if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
127	+ sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp \|\| die
128	+ fi
129	}
130
131	check_distribution_components() {
132	@@ -250,6 +254,7 @@ get_distribution_components() {
133
134	multilib_src_configure() {
135	local mycmakeargs=(
136	+ -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
137	-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
138	-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
139	-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
140
141	diff --git a/sys-devel/clang/clang-16.0.0_pre20230107.ebuild b/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
142	index f8a5211642c1..f6e6fd239ce2 100644
143	--- a/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
144	+++ b/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
145	@@ -85,6 +85,10 @@ src_prepare() {
146	eprefixify \
147	lib/Lex/InitHeaderSearch.cpp \
148	lib/Driver/ToolChains/Darwin.cpp \|\| die
149	+
150	+ if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
151	+ sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp \|\| die
152	+ fi
153	}
154
155	check_distribution_components() {
156	@@ -248,6 +252,7 @@ get_distribution_components() {
157
158	multilib_src_configure() {
159	local mycmakeargs=(
160	+ -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
161	-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
162	-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
163	-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
164
165	diff --git a/sys-devel/clang/clang-16.0.0_pre20230127.ebuild b/sys-devel/clang/clang-16.0.0_pre20230127.ebuild
166	index 4979e95cd523..b45257440e78 100644
167	--- a/sys-devel/clang/clang-16.0.0_pre20230127.ebuild
168	+++ b/sys-devel/clang/clang-16.0.0_pre20230127.ebuild
169	@@ -85,6 +85,10 @@ src_prepare() {
170	eprefixify \
171	lib/Lex/InitHeaderSearch.cpp \
172	lib/Driver/ToolChains/Darwin.cpp \|\| die
173	+
174	+ if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
175	+ sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp \|\| die
176	+ fi
177	}
178
179	check_distribution_components() {
180	@@ -250,6 +254,7 @@ get_distribution_components() {
181
182	multilib_src_configure() {
183	local mycmakeargs=(
184	+ -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
185	-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
186	-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
187	-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
188
189	diff --git a/sys-devel/clang/clang-17.0.0.9999.ebuild b/sys-devel/clang/clang-17.0.0.9999.ebuild
190	index 4979e95cd523..b45257440e78 100644
191	--- a/sys-devel/clang/clang-17.0.0.9999.ebuild
192	+++ b/sys-devel/clang/clang-17.0.0.9999.ebuild
193	@@ -85,6 +85,10 @@ src_prepare() {
194	eprefixify \
195	lib/Lex/InitHeaderSearch.cpp \
196	lib/Driver/ToolChains/Darwin.cpp \|\| die
197	+
198	+ if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
199	+ sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp \|\| die
200	+ fi
201	}
202
203	check_distribution_components() {
204	@@ -250,6 +254,7 @@ get_distribution_components() {
205
206	multilib_src_configure() {
207	local mycmakeargs=(
208	+ -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
209	-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
210	-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
211	-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"

Gentoo Archives: gentoo-commits