[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/ - 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/llvm/
Date:	Mon, 02 Jan 2023 22:27:56
Message-Id:	`1672698448.a670710b170e8fa133c5490366a87dbdda94d0a7.chewi@gentoo`

1

commit:     a670710b170e8fa133c5490366a87dbdda94d0a7

2

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

3

AuthorDate: Mon Jan  2 22:22:35 2023 +0000

4

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

5

CommitDate: Mon Jan  2 22:27:28 2023 +0000

6

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

7

8

sys-devel/llvm: Run llvm-tblgen from BROOT when cross-compiling, not EPREFIX

9

10

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

11

12

 sys-devel/llvm/llvm-13.0.1.ebuild             | 2 +-

13

 sys-devel/llvm/llvm-14.0.6-r2.ebuild          | 2 +-

14

 sys-devel/llvm/llvm-15.0.5.ebuild             | 2 +-

15

 sys-devel/llvm/llvm-15.0.6.9999.ebuild        | 2 +-

16

 sys-devel/llvm/llvm-15.0.6.ebuild             | 2 +-

17

 sys-devel/llvm/llvm-16.0.0.9999.ebuild        | 2 +-

18

 sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild | 2 +-

19

 sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild | 2 +-

20

 sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild | 2 +-

21

 9 files changed, 9 insertions(+), 9 deletions(-)

22

23

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

24

index cf405c121646..dbaae29ecdd4 100644

25

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

26

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

27

@@ -401,7 +401,7 @@ multilib_src_configure() {

28

fi

29

30

 	if tc-is-cross-compiler; then

31

-		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"

32

+		local tblgen="${BROOT}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"

33

 		[[ -x "${tblgen}" ]] \

34

 			|| die "${tblgen} not found or usable"

35

 		mycmakeargs+=(

36

37

diff --git a/sys-devel/llvm/llvm-14.0.6-r2.ebuild b/sys-devel/llvm/llvm-14.0.6-r2.ebuild

38

index 0f53397cf7ae..619870533d1b 100644

39

--- a/sys-devel/llvm/llvm-14.0.6-r2.ebuild

40

+++ b/sys-devel/llvm/llvm-14.0.6-r2.ebuild

41

@@ -415,7 +415,7 @@ multilib_src_configure() {

42

fi

43

44

 	if tc-is-cross-compiler; then

45

-		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"

46

+		local tblgen="${BROOT}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"

47

 		[[ -x "${tblgen}" ]] \

48

 			|| die "${tblgen} not found or usable"

49

 		mycmakeargs+=(

50

51

diff --git a/sys-devel/llvm/llvm-15.0.5.ebuild b/sys-devel/llvm/llvm-15.0.5.ebuild

52

index 86b72d9c66b4..f48a8da1f701 100644

53

--- a/sys-devel/llvm/llvm-15.0.5.ebuild

54

+++ b/sys-devel/llvm/llvm-15.0.5.ebuild

55

@@ -418,7 +418,7 @@ multilib_src_configure() {

56

fi

57

58

 	if tc-is-cross-compiler; then

59

-		local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

60

+		local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

61

 		[[ -x "${tblgen}" ]] \

62

 			|| die "${tblgen} not found or usable"

63

 		mycmakeargs+=(

64

65

diff --git a/sys-devel/llvm/llvm-15.0.6.9999.ebuild b/sys-devel/llvm/llvm-15.0.6.9999.ebuild

66

index ab36cada7cfb..8f078936032b 100644

67

--- a/sys-devel/llvm/llvm-15.0.6.9999.ebuild

68

+++ b/sys-devel/llvm/llvm-15.0.6.9999.ebuild

69

@@ -418,7 +418,7 @@ multilib_src_configure() {

70

fi

71

72

 	if tc-is-cross-compiler; then

73

-		local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

74

+		local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

75

 		[[ -x "${tblgen}" ]] \

76

 			|| die "${tblgen} not found or usable"

77

 		mycmakeargs+=(

78

79

diff --git a/sys-devel/llvm/llvm-15.0.6.ebuild b/sys-devel/llvm/llvm-15.0.6.ebuild

80

index e48bc7e27f16..a0f90b636940 100644

81

--- a/sys-devel/llvm/llvm-15.0.6.ebuild

82

+++ b/sys-devel/llvm/llvm-15.0.6.ebuild

83

@@ -418,7 +418,7 @@ multilib_src_configure() {

84

fi

85

86

 	if tc-is-cross-compiler; then

87

-		local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

88

+		local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

89

 		[[ -x "${tblgen}" ]] \

90

 			|| die "${tblgen} not found or usable"

91

 		mycmakeargs+=(

92

93

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

94

index ce7bb47d6446..5f54f11fe7fe 100644

95

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

96

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

97

@@ -421,7 +421,7 @@ multilib_src_configure() {

98

fi

99

100

 	if tc-is-cross-compiler; then

101

-		local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

102

+		local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

103

 		[[ -x "${tblgen}" ]] \

104

 			|| die "${tblgen} not found or usable"

105

 		mycmakeargs+=(

106

107

diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild

108

index 5102c71fb739..9b5f96110a1f 100644

109

--- a/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild

110

+++ b/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild

111

@@ -421,7 +421,7 @@ multilib_src_configure() {

112

fi

113

114

 	if tc-is-cross-compiler; then

115

-		local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

116

+		local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

117

 		[[ -x "${tblgen}" ]] \

118

 			|| die "${tblgen} not found or usable"

119

 		mycmakeargs+=(

120

121

diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild

122

index 5102c71fb739..9b5f96110a1f 100644

123

--- a/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild

124

+++ b/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild

125

@@ -421,7 +421,7 @@ multilib_src_configure() {

126

fi

127

128

 	if tc-is-cross-compiler; then

129

-		local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

130

+		local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

131

 		[[ -x "${tblgen}" ]] \

132

 			|| die "${tblgen} not found or usable"

133

 		mycmakeargs+=(

134

135

diff --git a/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild

136

index 0e4934164443..a62b3a87d4aa 100644

137

--- a/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild

138

+++ b/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild

139

@@ -421,7 +421,7 @@ multilib_src_configure() {

140

fi

141

142

 	if tc-is-cross-compiler; then

143

-		local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

144

+		local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"

145

 		[[ -x "${tblgen}" ]] \

146

 			|| die "${tblgen} not found or usable"

147

 		mycmakeargs+=(

1	commit: a670710b170e8fa133c5490366a87dbdda94d0a7
2	Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3	AuthorDate: Mon Jan 2 22:22:35 2023 +0000
4	Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5	CommitDate: Mon Jan 2 22:27:28 2023 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a670710b
7
8	sys-devel/llvm: Run llvm-tblgen from BROOT when cross-compiling, not EPREFIX
9
10	Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
11
12	sys-devel/llvm/llvm-13.0.1.ebuild \| 2 +-
13	sys-devel/llvm/llvm-14.0.6-r2.ebuild \| 2 +-
14	sys-devel/llvm/llvm-15.0.5.ebuild \| 2 +-
15	sys-devel/llvm/llvm-15.0.6.9999.ebuild \| 2 +-
16	sys-devel/llvm/llvm-15.0.6.ebuild \| 2 +-
17	sys-devel/llvm/llvm-16.0.0.9999.ebuild \| 2 +-
18	sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild \| 2 +-
19	sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild \| 2 +-
20	sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild \| 2 +-
21	9 files changed, 9 insertions(+), 9 deletions(-)
22
23	diff --git a/sys-devel/llvm/llvm-13.0.1.ebuild b/sys-devel/llvm/llvm-13.0.1.ebuild
24	index cf405c121646..dbaae29ecdd4 100644
25	--- a/sys-devel/llvm/llvm-13.0.1.ebuild
26	+++ b/sys-devel/llvm/llvm-13.0.1.ebuild
27	@@ -401,7 +401,7 @@ multilib_src_configure() {
28	fi
29
30	if tc-is-cross-compiler; then
31	- local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
32	+ local tblgen="${BROOT}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
33	[[ -x "${tblgen}" ]] \
34	\|\| die "${tblgen} not found or usable"
35	mycmakeargs+=(
36
37	diff --git a/sys-devel/llvm/llvm-14.0.6-r2.ebuild b/sys-devel/llvm/llvm-14.0.6-r2.ebuild
38	index 0f53397cf7ae..619870533d1b 100644
39	--- a/sys-devel/llvm/llvm-14.0.6-r2.ebuild
40	+++ b/sys-devel/llvm/llvm-14.0.6-r2.ebuild
41	@@ -415,7 +415,7 @@ multilib_src_configure() {
42	fi
43
44	if tc-is-cross-compiler; then
45	- local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
46	+ local tblgen="${BROOT}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
47	[[ -x "${tblgen}" ]] \
48	\|\| die "${tblgen} not found or usable"
49	mycmakeargs+=(
50
51	diff --git a/sys-devel/llvm/llvm-15.0.5.ebuild b/sys-devel/llvm/llvm-15.0.5.ebuild
52	index 86b72d9c66b4..f48a8da1f701 100644
53	--- a/sys-devel/llvm/llvm-15.0.5.ebuild
54	+++ b/sys-devel/llvm/llvm-15.0.5.ebuild
55	@@ -418,7 +418,7 @@ multilib_src_configure() {
56	fi
57
58	if tc-is-cross-compiler; then
59	- local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
60	+ local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
61	[[ -x "${tblgen}" ]] \
62	\|\| die "${tblgen} not found or usable"
63	mycmakeargs+=(
64
65	diff --git a/sys-devel/llvm/llvm-15.0.6.9999.ebuild b/sys-devel/llvm/llvm-15.0.6.9999.ebuild
66	index ab36cada7cfb..8f078936032b 100644
67	--- a/sys-devel/llvm/llvm-15.0.6.9999.ebuild
68	+++ b/sys-devel/llvm/llvm-15.0.6.9999.ebuild
69	@@ -418,7 +418,7 @@ multilib_src_configure() {
70	fi
71
72	if tc-is-cross-compiler; then
73	- local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
74	+ local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
75	[[ -x "${tblgen}" ]] \
76	\|\| die "${tblgen} not found or usable"
77	mycmakeargs+=(
78
79	diff --git a/sys-devel/llvm/llvm-15.0.6.ebuild b/sys-devel/llvm/llvm-15.0.6.ebuild
80	index e48bc7e27f16..a0f90b636940 100644
81	--- a/sys-devel/llvm/llvm-15.0.6.ebuild
82	+++ b/sys-devel/llvm/llvm-15.0.6.ebuild
83	@@ -418,7 +418,7 @@ multilib_src_configure() {
84	fi
85
86	if tc-is-cross-compiler; then
87	- local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
88	+ local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
89	[[ -x "${tblgen}" ]] \
90	\|\| die "${tblgen} not found or usable"
91	mycmakeargs+=(
92
93	diff --git a/sys-devel/llvm/llvm-16.0.0.9999.ebuild b/sys-devel/llvm/llvm-16.0.0.9999.ebuild
94	index ce7bb47d6446..5f54f11fe7fe 100644
95	--- a/sys-devel/llvm/llvm-16.0.0.9999.ebuild
96	+++ b/sys-devel/llvm/llvm-16.0.0.9999.ebuild
97	@@ -421,7 +421,7 @@ multilib_src_configure() {
98	fi
99
100	if tc-is-cross-compiler; then
101	- local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
102	+ local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
103	[[ -x "${tblgen}" ]] \
104	\|\| die "${tblgen} not found or usable"
105	mycmakeargs+=(
106
107	diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild
108	index 5102c71fb739..9b5f96110a1f 100644
109	--- a/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild
110	+++ b/sys-devel/llvm/llvm-16.0.0_pre20221217.ebuild
111	@@ -421,7 +421,7 @@ multilib_src_configure() {
112	fi
113
114	if tc-is-cross-compiler; then
115	- local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
116	+ local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
117	[[ -x "${tblgen}" ]] \
118	\|\| die "${tblgen} not found or usable"
119	mycmakeargs+=(
120
121	diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild
122	index 5102c71fb739..9b5f96110a1f 100644
123	--- a/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild
124	+++ b/sys-devel/llvm/llvm-16.0.0_pre20221226.ebuild
125	@@ -421,7 +421,7 @@ multilib_src_configure() {
126	fi
127
128	if tc-is-cross-compiler; then
129	- local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
130	+ local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
131	[[ -x "${tblgen}" ]] \
132	\|\| die "${tblgen} not found or usable"
133	mycmakeargs+=(
134
135	diff --git a/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild
136	index 0e4934164443..a62b3a87d4aa 100644
137	--- a/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild
138	+++ b/sys-devel/llvm/llvm-16.0.0_pre20230101.ebuild
139	@@ -421,7 +421,7 @@ multilib_src_configure() {
140	fi
141
142	if tc-is-cross-compiler; then
143	- local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
144	+ local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
145	[[ -x "${tblgen}" ]] \
146	\|\| die "${tblgen} not found or usable"
147	mycmakeargs+=(

Gentoo Archives: gentoo-commits