[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/ - gentoo-commits

From:	Sam James <sam@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
Date:	Tue, 17 May 2022 05:34:55
Message-Id:	`1652765634.669aa39c6f876b0d851e3704f97153a6dc1bdf93.sam@gentoo`

1

commit:     669aa39c6f876b0d851e3704f97153a6dc1bdf93

2

Author:     Sam James <sam <AT> gentoo <DOT> org>

3

AuthorDate: Tue May 17 01:48:55 2022 +0000

4

Commit:     Sam James <sam <AT> gentoo <DOT> org>

5

CommitDate: Tue May 17 05:33:54 2022 +0000

6

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

7

8

dev-db/mariadb: [QA] drop (very) stale GCC version checks

9

10

Signed-off-by: Sam James <sam <AT> gentoo.org>

11

12

 dev-db/mariadb/mariadb-10.2.41.ebuild   | 23 +----------------------

13

 dev-db/mariadb/mariadb-10.3.32.ebuild   | 23 +----------------------

14

 dev-db/mariadb/mariadb-10.4.22.ebuild   | 23 +----------------------

15

 dev-db/mariadb/mariadb-10.5.13.ebuild   | 16 +---------------

16

 dev-db/mariadb/mariadb-10.5.15.ebuild   | 16 +---------------

17

 dev-db/mariadb/mariadb-10.6.5-r1.ebuild | 16 +---------------

18

 6 files changed, 6 insertions(+), 111 deletions(-)

19

20

diff --git a/dev-db/mariadb/mariadb-10.2.41.ebuild b/dev-db/mariadb/mariadb-10.2.41.ebuild

21

index 64caa78b49b3..43001d345c8a 100644

22

--- a/dev-db/mariadb/mariadb-10.2.41.ebuild

23

+++ b/dev-db/mariadb/mariadb-10.2.41.ebuild

24

@@ -81,9 +81,7 @@ COMMON_DEPEND="

25

 	>=dev-libs/libpcre-8.41-r1:3=

26

 	virtual/libcrypt:=

27

"

28

-BDEPEND="virtual/yacc

29

-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )

30

-"

31

+BDEPEND="virtual/yacc"

32

 DEPEND="static? ( sys-libs/ncurses[static-libs] )

33

 	server? (

34

 		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )

35

@@ -185,25 +183,6 @@ mysql_init_vars() {

36

37

 pkg_setup() {

38

 	if [[ ${MERGE_TYPE} != binary ]] ; then

39

-		local GCC_MAJOR_SET=$(gcc-major-version)

40

-		local GCC_MINOR_SET=$(gcc-minor-version)

41

-

42

-		if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \

43

-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then

44

-			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."

45

-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."

46

-			die

47

-		fi

48

-

49

-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on

50

-		# non x86{,_64} arches

51

-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \

52

-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then

53

-			eerror "${PN} needs to be built with gcc-4.7 or later."

54

-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."

55

-			die

56

-		fi

57

-

58

 		if has test ${FEATURES} ; then

59

 			# Bug #213475 - MySQL _will_ object strenuously if your machine is named

60

 			# localhost. Also causes weird failures.

61

62

diff --git a/dev-db/mariadb/mariadb-10.3.32.ebuild b/dev-db/mariadb/mariadb-10.3.32.ebuild

63

index 929fb71bf3fd..b87897821608 100644

64

--- a/dev-db/mariadb/mariadb-10.3.32.ebuild

65

+++ b/dev-db/mariadb/mariadb-10.3.32.ebuild

66

@@ -81,9 +81,7 @@ COMMON_DEPEND="

67

 	>=dev-libs/libpcre-8.41-r1:3=

68

 	virtual/libcrypt:=

69

"

70

-BDEPEND="virtual/yacc

71

-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )

72

-"

73

+BDEPEND="virtual/yacc"

74

 DEPEND="static? ( sys-libs/ncurses[static-libs] )

75

 	server? (

76

 		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )

77

@@ -176,25 +174,6 @@ mysql_init_vars() {

78

79

 pkg_setup() {

80

 	if [[ ${MERGE_TYPE} != binary ]] ; then

81

-		local GCC_MAJOR_SET=$(gcc-major-version)

82

-		local GCC_MINOR_SET=$(gcc-minor-version)

83

-

84

-		if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \

85

-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then

86

-			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."

87

-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."

88

-			die

89

-		fi

90

-

91

-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on

92

-		# non x86{,_64} arches

93

-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \

94

-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then

95

-			eerror "${PN} needs to be built with gcc-4.7 or later."

96

-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."

97

-			die

98

-		fi

99

-

100

 		if has test ${FEATURES} ; then

101

 			# Bug #213475 - MySQL _will_ object strenuously if your machine is named

102

 			# localhost. Also causes weird failures.

103

104

diff --git a/dev-db/mariadb/mariadb-10.4.22.ebuild b/dev-db/mariadb/mariadb-10.4.22.ebuild

105

index 96db7019ac60..14def683d3a6 100644

106

--- a/dev-db/mariadb/mariadb-10.4.22.ebuild

107

+++ b/dev-db/mariadb/mariadb-10.4.22.ebuild

108

@@ -81,9 +81,7 @@ COMMON_DEPEND="

109

 	>=dev-libs/libpcre-8.41-r1:3=

110

 	virtual/libcrypt:=

111

"

112

-BDEPEND="virtual/yacc

113

-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )

114

-"

115

+BDEPEND="virtual/yacc"

116

 DEPEND="static? ( sys-libs/ncurses[static-libs] )

117

 	server? (

118

 		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )

119

@@ -177,25 +175,6 @@ mysql_init_vars() {

120

121

 pkg_setup() {

122

 	if [[ ${MERGE_TYPE} != binary ]] ; then

123

-		local GCC_MAJOR_SET=$(gcc-major-version)

124

-		local GCC_MINOR_SET=$(gcc-minor-version)

125

-

126

-		if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \

127

-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then

128

-			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."

129

-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."

130

-			die

131

-		fi

132

-

133

-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on

134

-		# non x86{,_64} arches

135

-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \

136

-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then

137

-			eerror "${PN} needs to be built with gcc-4.7 or later."

138

-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."

139

-			die

140

-		fi

141

-

142

 		if has test ${FEATURES} ; then

143

 			# Bug #213475 - MySQL _will_ object strenuously if your machine is named

144

 			# localhost. Also causes weird failures.

145

146

diff --git a/dev-db/mariadb/mariadb-10.5.13.ebuild b/dev-db/mariadb/mariadb-10.5.13.ebuild

147

index 195bd0b0ceda..cac5f2acfa61 100644

148

--- a/dev-db/mariadb/mariadb-10.5.13.ebuild

149

+++ b/dev-db/mariadb/mariadb-10.5.13.ebuild

150

@@ -87,9 +87,7 @@ COMMON_DEPEND="

151

 		>=dev-libs/openssl-1.0.0:0=

152

)

153

"

154

-BDEPEND="virtual/yacc

155

-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )

156

-"

157

+BDEPEND="virtual/yacc"

158

 DEPEND="${COMMON_DEPEND}

159

 	server? (

160

 		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )

161

@@ -185,18 +183,6 @@ mysql_init_vars() {

162

163

 pkg_setup() {

164

 	if [[ ${MERGE_TYPE} != binary ]] ; then

165

-		local GCC_MAJOR_SET=$(gcc-major-version)

166

-		local GCC_MINOR_SET=$(gcc-minor-version)

167

-

168

-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on

169

-		# non x86{,_64} arches

170

-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \

171

-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then

172

-			eerror "${PN} needs to be built with gcc-4.7 or later."

173

-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."

174

-			die

175

-		fi

176

-

177

 		if has test ${FEATURES} ; then

178

 			# Bug #213475 - MySQL _will_ object strenuously if your machine is named

179

 			# localhost. Also causes weird failures.

180

181

diff --git a/dev-db/mariadb/mariadb-10.5.15.ebuild b/dev-db/mariadb/mariadb-10.5.15.ebuild

182

index 34b1fb9c1940..5f5be0b5ce09 100644

183

--- a/dev-db/mariadb/mariadb-10.5.15.ebuild

184

+++ b/dev-db/mariadb/mariadb-10.5.15.ebuild

185

@@ -87,9 +87,7 @@ COMMON_DEPEND="

186

 		>=dev-libs/openssl-1.0.0:0=

187

)

188

"

189

-BDEPEND="virtual/yacc

190

-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )

191

-"

192

+BDEPEND="virtual/yacc"

193

 DEPEND="${COMMON_DEPEND}

194

 	server? (

195

 		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )

196

@@ -185,18 +183,6 @@ mysql_init_vars() {

197

198

 pkg_setup() {

199

 	if [[ ${MERGE_TYPE} != binary ]] ; then

200

-		local GCC_MAJOR_SET=$(gcc-major-version)

201

-		local GCC_MINOR_SET=$(gcc-minor-version)

202

-

203

-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on

204

-		# non x86{,_64} arches

205

-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \

206

-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then

207

-			eerror "${PN} needs to be built with gcc-4.7 or later."

208

-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."

209

-			die

210

-		fi

211

-

212

 		if has test ${FEATURES} ; then

213

 			# Bug #213475 - MySQL _will_ object strenuously if your machine is named

214

 			# localhost. Also causes weird failures.

215

216

diff --git a/dev-db/mariadb/mariadb-10.6.5-r1.ebuild b/dev-db/mariadb/mariadb-10.6.5-r1.ebuild

217

index c7d56f50f725..0d12908c713b 100644

218

--- a/dev-db/mariadb/mariadb-10.6.5-r1.ebuild

219

+++ b/dev-db/mariadb/mariadb-10.6.5-r1.ebuild

220

@@ -87,9 +87,7 @@ COMMON_DEPEND="

221

 		>=dev-libs/openssl-1.0.0:0=

222

)

223

"

224

-BDEPEND="virtual/yacc

225

-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )

226

-"

227

+BDEPEND="virtual/yacc"

228

 DEPEND="${COMMON_DEPEND}

229

 	server? (

230

 		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )

231

@@ -185,18 +183,6 @@ mysql_init_vars() {

232

233

 pkg_setup() {

234

 	if [[ ${MERGE_TYPE} != binary ]] ; then

235

-		local GCC_MAJOR_SET=$(gcc-major-version)

236

-		local GCC_MINOR_SET=$(gcc-minor-version)

237

-

238

-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on

239

-		# non x86{,_64} arches

240

-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \

241

-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then

242

-			eerror "${PN} needs to be built with gcc-4.7 or later."

243

-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."

244

-			die

245

-		fi

246

-

247

 		if has test ${FEATURES} ; then

248

 			# Bug #213475 - MySQL _will_ object strenuously if your machine is named

249

 			# localhost. Also causes weird failures.

1	commit: 669aa39c6f876b0d851e3704f97153a6dc1bdf93
2	Author: Sam James <sam <AT> gentoo <DOT> org>
3	AuthorDate: Tue May 17 01:48:55 2022 +0000
4	Commit: Sam James <sam <AT> gentoo <DOT> org>
5	CommitDate: Tue May 17 05:33:54 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669aa39c
7
8	dev-db/mariadb: [QA] drop (very) stale GCC version checks
9
10	Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12	dev-db/mariadb/mariadb-10.2.41.ebuild \| 23 +----------------------
13	dev-db/mariadb/mariadb-10.3.32.ebuild \| 23 +----------------------
14	dev-db/mariadb/mariadb-10.4.22.ebuild \| 23 +----------------------
15	dev-db/mariadb/mariadb-10.5.13.ebuild \| 16 +---------------
16	dev-db/mariadb/mariadb-10.5.15.ebuild \| 16 +---------------
17	dev-db/mariadb/mariadb-10.6.5-r1.ebuild \| 16 +---------------
18	6 files changed, 6 insertions(+), 111 deletions(-)
19
20	diff --git a/dev-db/mariadb/mariadb-10.2.41.ebuild b/dev-db/mariadb/mariadb-10.2.41.ebuild
21	index 64caa78b49b3..43001d345c8a 100644
22	--- a/dev-db/mariadb/mariadb-10.2.41.ebuild
23	+++ b/dev-db/mariadb/mariadb-10.2.41.ebuild
24	@@ -81,9 +81,7 @@ COMMON_DEPEND="
25	>=dev-libs/libpcre-8.41-r1:3=
26	virtual/libcrypt:=
27	"
28	-BDEPEND="virtual/yacc
29	- \|\| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
30	-"
31	+BDEPEND="virtual/yacc"
32	DEPEND="static? ( sys-libs/ncurses[static-libs] )
33	server? (
34	extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
35	@@ -185,25 +183,6 @@ mysql_init_vars() {
36
37	pkg_setup() {
38	if [[ ${MERGE_TYPE} != binary ]] ; then
39	- local GCC_MAJOR_SET=$(gcc-major-version)
40	- local GCC_MINOR_SET=$(gcc-minor-version)
41	-
42	- if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 \|\| \
43	- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
44	- eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
45	- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
46	- die
47	- fi
48	-
49	- # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
50	- # non x86{,_64} arches
51	- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 \|\| \
52	- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
53	- eerror "${PN} needs to be built with gcc-4.7 or later."
54	- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
55	- die
56	- fi
57	-
58	if has test ${FEATURES} ; then
59	# Bug #213475 - MySQL _will_ object strenuously if your machine is named
60	# localhost. Also causes weird failures.
61
62	diff --git a/dev-db/mariadb/mariadb-10.3.32.ebuild b/dev-db/mariadb/mariadb-10.3.32.ebuild
63	index 929fb71bf3fd..b87897821608 100644
64	--- a/dev-db/mariadb/mariadb-10.3.32.ebuild
65	+++ b/dev-db/mariadb/mariadb-10.3.32.ebuild
66	@@ -81,9 +81,7 @@ COMMON_DEPEND="
67	>=dev-libs/libpcre-8.41-r1:3=
68	virtual/libcrypt:=
69	"
70	-BDEPEND="virtual/yacc
71	- \|\| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
72	-"
73	+BDEPEND="virtual/yacc"
74	DEPEND="static? ( sys-libs/ncurses[static-libs] )
75	server? (
76	extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
77	@@ -176,25 +174,6 @@ mysql_init_vars() {
78
79	pkg_setup() {
80	if [[ ${MERGE_TYPE} != binary ]] ; then
81	- local GCC_MAJOR_SET=$(gcc-major-version)
82	- local GCC_MINOR_SET=$(gcc-minor-version)
83	-
84	- if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 \|\| \
85	- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
86	- eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
87	- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
88	- die
89	- fi
90	-
91	- # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
92	- # non x86{,_64} arches
93	- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 \|\| \
94	- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
95	- eerror "${PN} needs to be built with gcc-4.7 or later."
96	- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
97	- die
98	- fi
99	-
100	if has test ${FEATURES} ; then
101	# Bug #213475 - MySQL _will_ object strenuously if your machine is named
102	# localhost. Also causes weird failures.
103
104	diff --git a/dev-db/mariadb/mariadb-10.4.22.ebuild b/dev-db/mariadb/mariadb-10.4.22.ebuild
105	index 96db7019ac60..14def683d3a6 100644
106	--- a/dev-db/mariadb/mariadb-10.4.22.ebuild
107	+++ b/dev-db/mariadb/mariadb-10.4.22.ebuild
108	@@ -81,9 +81,7 @@ COMMON_DEPEND="
109	>=dev-libs/libpcre-8.41-r1:3=
110	virtual/libcrypt:=
111	"
112	-BDEPEND="virtual/yacc
113	- \|\| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
114	-"
115	+BDEPEND="virtual/yacc"
116	DEPEND="static? ( sys-libs/ncurses[static-libs] )
117	server? (
118	extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
119	@@ -177,25 +175,6 @@ mysql_init_vars() {
120
121	pkg_setup() {
122	if [[ ${MERGE_TYPE} != binary ]] ; then
123	- local GCC_MAJOR_SET=$(gcc-major-version)
124	- local GCC_MINOR_SET=$(gcc-minor-version)
125	-
126	- if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 \|\| \
127	- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
128	- eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
129	- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
130	- die
131	- fi
132	-
133	- # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
134	- # non x86{,_64} arches
135	- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 \|\| \
136	- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
137	- eerror "${PN} needs to be built with gcc-4.7 or later."
138	- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
139	- die
140	- fi
141	-
142	if has test ${FEATURES} ; then
143	# Bug #213475 - MySQL _will_ object strenuously if your machine is named
144	# localhost. Also causes weird failures.
145
146	diff --git a/dev-db/mariadb/mariadb-10.5.13.ebuild b/dev-db/mariadb/mariadb-10.5.13.ebuild
147	index 195bd0b0ceda..cac5f2acfa61 100644
148	--- a/dev-db/mariadb/mariadb-10.5.13.ebuild
149	+++ b/dev-db/mariadb/mariadb-10.5.13.ebuild
150	@@ -87,9 +87,7 @@ COMMON_DEPEND="
151	>=dev-libs/openssl-1.0.0:0=
152	)
153	"
154	-BDEPEND="virtual/yacc
155	- \|\| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
156	-"
157	+BDEPEND="virtual/yacc"
158	DEPEND="${COMMON_DEPEND}
159	server? (
160	extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
161	@@ -185,18 +183,6 @@ mysql_init_vars() {
162
163	pkg_setup() {
164	if [[ ${MERGE_TYPE} != binary ]] ; then
165	- local GCC_MAJOR_SET=$(gcc-major-version)
166	- local GCC_MINOR_SET=$(gcc-minor-version)
167	-
168	- # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
169	- # non x86{,_64} arches
170	- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 \|\| \
171	- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
172	- eerror "${PN} needs to be built with gcc-4.7 or later."
173	- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
174	- die
175	- fi
176	-
177	if has test ${FEATURES} ; then
178	# Bug #213475 - MySQL _will_ object strenuously if your machine is named
179	# localhost. Also causes weird failures.
180
181	diff --git a/dev-db/mariadb/mariadb-10.5.15.ebuild b/dev-db/mariadb/mariadb-10.5.15.ebuild
182	index 34b1fb9c1940..5f5be0b5ce09 100644
183	--- a/dev-db/mariadb/mariadb-10.5.15.ebuild
184	+++ b/dev-db/mariadb/mariadb-10.5.15.ebuild
185	@@ -87,9 +87,7 @@ COMMON_DEPEND="
186	>=dev-libs/openssl-1.0.0:0=
187	)
188	"
189	-BDEPEND="virtual/yacc
190	- \|\| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
191	-"
192	+BDEPEND="virtual/yacc"
193	DEPEND="${COMMON_DEPEND}
194	server? (
195	extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
196	@@ -185,18 +183,6 @@ mysql_init_vars() {
197
198	pkg_setup() {
199	if [[ ${MERGE_TYPE} != binary ]] ; then
200	- local GCC_MAJOR_SET=$(gcc-major-version)
201	- local GCC_MINOR_SET=$(gcc-minor-version)
202	-
203	- # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
204	- # non x86{,_64} arches
205	- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 \|\| \
206	- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
207	- eerror "${PN} needs to be built with gcc-4.7 or later."
208	- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
209	- die
210	- fi
211	-
212	if has test ${FEATURES} ; then
213	# Bug #213475 - MySQL _will_ object strenuously if your machine is named
214	# localhost. Also causes weird failures.
215
216	diff --git a/dev-db/mariadb/mariadb-10.6.5-r1.ebuild b/dev-db/mariadb/mariadb-10.6.5-r1.ebuild
217	index c7d56f50f725..0d12908c713b 100644
218	--- a/dev-db/mariadb/mariadb-10.6.5-r1.ebuild
219	+++ b/dev-db/mariadb/mariadb-10.6.5-r1.ebuild
220	@@ -87,9 +87,7 @@ COMMON_DEPEND="
221	>=dev-libs/openssl-1.0.0:0=
222	)
223	"
224	-BDEPEND="virtual/yacc
225	- \|\| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
226	-"
227	+BDEPEND="virtual/yacc"
228	DEPEND="${COMMON_DEPEND}
229	server? (
230	extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
231	@@ -185,18 +183,6 @@ mysql_init_vars() {
232
233	pkg_setup() {
234	if [[ ${MERGE_TYPE} != binary ]] ; then
235	- local GCC_MAJOR_SET=$(gcc-major-version)
236	- local GCC_MINOR_SET=$(gcc-minor-version)
237	-
238	- # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
239	- # non x86{,_64} arches
240	- if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 \|\| \
241	- ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
242	- eerror "${PN} needs to be built with gcc-4.7 or later."
243	- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
244	- die
245	- fi
246	-
247	if has test ${FEATURES} ; then
248	# Bug #213475 - MySQL _will_ object strenuously if your machine is named
249	# localhost. Also causes weird failures.

Gentoo Archives: gentoo-commits