Gentoo Archives: gentoo-commits

From: "Magnus Granberg (zorry)" <zorry@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/mesa: ChangeLog mesa-9.2.5-r1.ebuild mesa-10.2.2.ebuild mesa-10.1.6.ebuild mesa-10.2.1.ebuild
Date: Tue, 08 Jul 2014 22:15:12
Message-Id: 20140708221506.AE7A22004E@flycatcher.gentoo.org
1 zorry 14/07/08 22:15:06
2
3 Modified: ChangeLog mesa-9.2.5-r1.ebuild mesa-10.2.2.ebuild
4 mesa-10.1.6.ebuild mesa-10.2.1.ebuild
5 Log:
6 Disable asm only on x86 and if use pic #512208
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key FD79807F)
9
10 Revision Changes Path
11 1.567 media-libs/mesa/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.567&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.567&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.566&r2=1.567
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v
20 retrieving revision 1.566
21 retrieving revision 1.567
22 diff -u -r1.566 -r1.567
23 --- ChangeLog 25 Jun 2014 10:45:41 -0000 1.566
24 +++ ChangeLog 8 Jul 2014 22:15:06 -0000 1.567
25 @@ -1,6 +1,10 @@
26 # ChangeLog for media-libs/mesa
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.566 2014/06/25 10:45:41 chithanh Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.567 2014/07/08 22:15:06 zorry Exp $
30 +
31 + 08 Jul 2014; Magnus Granberg zorry@g.o mesa-9.2.5-r1.ebuild,
32 + mesa-10.1.6.ebuild, mesa-10.2.1.ebuild, mesa-10.2.2.ebuild:
33 + Disable asm on x86 only if use pic #512208
34
35 *mesa-10.1.6 (25 Jun 2014)
36 *mesa-10.2.2 (25 Jun 2014)
37
38
39
40 1.3 media-libs/mesa/mesa-9.2.5-r1.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild?rev=1.3&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild?rev=1.3&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild?r1=1.2&r2=1.3
45
46 Index: mesa-9.2.5-r1.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild,v
49 retrieving revision 1.2
50 retrieving revision 1.3
51 diff -u -r1.2 -r1.3
52 --- mesa-9.2.5-r1.ebuild 18 Jun 2014 19:55:05 -0000 1.2
53 +++ mesa-9.2.5-r1.ebuild 8 Jul 2014 22:15:06 -0000 1.3
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2014 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild,v 1.2 2014/06/18 19:55:05 mgorny Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild,v 1.3 2014/07/08 22:15:06 zorry Exp $
59
60 EAPI=5
61
62 @@ -301,6 +301,11 @@
63 "
64 fi
65
66 + # on abi_x86_32 hardened we need to have asm disable
67 + if [[ ${ABI} == x86* ]] && use pic; then
68 + myconf+=" --disable-asm"
69 + fi
70 +
71 # build fails with BSD indent, bug #428112
72 use userland_GNU || export INDENT=cat
73
74 @@ -321,7 +326,6 @@
75 $(use_enable gles2) \
76 $(use_enable nptl glx-tls) \
77 $(use_enable osmesa) \
78 - $(use_enable !pic asm) \
79 $(use_enable xa) \
80 $(use_enable xorg) \
81 $(use_with llvm-shared-libs) \
82
83
84
85 1.2 media-libs/mesa/mesa-10.2.2.ebuild
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild?rev=1.2&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild?rev=1.2&content-type=text/plain
89 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild?r1=1.1&r2=1.2
90
91 Index: mesa-10.2.2.ebuild
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild,v
94 retrieving revision 1.1
95 retrieving revision 1.2
96 diff -u -r1.1 -r1.2
97 --- mesa-10.2.2.ebuild 25 Jun 2014 10:45:41 -0000 1.1
98 +++ mesa-10.2.2.ebuild 8 Jul 2014 22:15:06 -0000 1.2
99 @@ -1,6 +1,6 @@
100 # Copyright 1999-2014 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild,v 1.1 2014/06/25 10:45:41 chithanh Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild,v 1.2 2014/07/08 22:15:06 zorry Exp $
104
105 EAPI=5
106
107 @@ -300,6 +300,11 @@
108 "
109 fi
110
111 + # on abi_x86_32 hardened we need to have asm disable
112 + if [[ ${ABI} == x86* ]] && use pic; then
113 + myconf+=" --disable-asm"
114 + fi
115 +
116 # build fails with BSD indent, bug #428112
117 use userland_GNU || export INDENT=cat
118
119 @@ -316,7 +321,6 @@
120 $(use_enable gles2) \
121 $(use_enable nptl glx-tls) \
122 $(use_enable osmesa) \
123 - $(use_enable !pic asm) \
124 --enable-llvm-shared-libs \
125 --with-dri-drivers=${DRI_DRIVERS} \
126 --with-gallium-drivers=${GALLIUM_DRIVERS} \
127
128
129
130 1.2 media-libs/mesa/mesa-10.1.6.ebuild
131
132 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild?rev=1.2&view=markup
133 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild?rev=1.2&content-type=text/plain
134 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild?r1=1.1&r2=1.2
135
136 Index: mesa-10.1.6.ebuild
137 ===================================================================
138 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild,v
139 retrieving revision 1.1
140 retrieving revision 1.2
141 diff -u -r1.1 -r1.2
142 --- mesa-10.1.6.ebuild 25 Jun 2014 10:45:41 -0000 1.1
143 +++ mesa-10.1.6.ebuild 8 Jul 2014 22:15:06 -0000 1.2
144 @@ -1,6 +1,6 @@
145 # Copyright 1999-2014 Gentoo Foundation
146 # Distributed under the terms of the GNU General Public License v2
147 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild,v 1.1 2014/06/25 10:45:41 chithanh Exp $
148 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild,v 1.2 2014/07/08 22:15:06 zorry Exp $
149
150 EAPI=5
151
152 @@ -301,6 +301,11 @@
153 "
154 fi
155
156 + # on abi_x86_32 hardened we need to have asm disable
157 + if [[ ${ABI} == x86* ]] && use pic; then
158 + myconf+=" --disable-asm"
159 + fi
160 +
161 # build fails with BSD indent, bug #428112
162 use userland_GNU || export INDENT=cat
163
164 @@ -317,7 +322,6 @@
165 $(use_enable gles2) \
166 $(use_enable nptl glx-tls) \
167 $(use_enable osmesa) \
168 - $(use_enable !pic asm) \
169 --with-dri-drivers=${DRI_DRIVERS} \
170 --with-gallium-drivers=${GALLIUM_DRIVERS} \
171 PYTHON2="${PYTHON}" \
172
173
174
175 1.3 media-libs/mesa/mesa-10.2.1.ebuild
176
177 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild?rev=1.3&view=markup
178 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild?rev=1.3&content-type=text/plain
179 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild?r1=1.2&r2=1.3
180
181 Index: mesa-10.2.1.ebuild
182 ===================================================================
183 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild,v
184 retrieving revision 1.2
185 retrieving revision 1.3
186 diff -u -r1.2 -r1.3
187 --- mesa-10.2.1.ebuild 18 Jun 2014 19:55:05 -0000 1.2
188 +++ mesa-10.2.1.ebuild 8 Jul 2014 22:15:06 -0000 1.3
189 @@ -1,6 +1,6 @@
190 # Copyright 1999-2014 Gentoo Foundation
191 # Distributed under the terms of the GNU General Public License v2
192 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild,v 1.2 2014/06/18 19:55:05 mgorny Exp $
193 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild,v 1.3 2014/07/08 22:15:06 zorry Exp $
194
195 EAPI=5
196
197 @@ -300,6 +300,11 @@
198 "
199 fi
200
201 + # on abi_x86_32 hardened we need to have asm disable
202 + if [[ ${ABI} == x86* ]] && use pic; then
203 + myconf+=" --disable-asm"
204 + fi
205 +
206 # build fails with BSD indent, bug #428112
207 use userland_GNU || export INDENT=cat
208
209 @@ -316,7 +321,6 @@
210 $(use_enable gles2) \
211 $(use_enable nptl glx-tls) \
212 $(use_enable osmesa) \
213 - $(use_enable !pic asm) \
214 --enable-llvm-shared-libs \
215 --with-dri-drivers=${DRI_DRIVERS} \
216 --with-gallium-drivers=${GALLIUM_DRIVERS} \