Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
Date: Mon, 21 Sep 2015 19:51:54
Message-Id: 1442865102.8a3f7a2f99c04c6d43988d17b18f19c00cf1db0f.mattst88@gentoo
1 commit: 8a3f7a2f99c04c6d43988d17b18f19c00cf1db0f
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 21 19:51:19 2015 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 21 19:51:42 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3f7a2f
7
8 media-libs/mesa: Update to use upstream glx-read-only-text flag.
9
10 Package-Manager: portage-2.2.20.1
11
12 media-libs/mesa/mesa-9999.ebuild | 11 +++--------
13 1 file changed, 3 insertions(+), 8 deletions(-)
14
15 diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
16 index d166219..e7cf9a9 100644
17 --- a/media-libs/mesa/mesa-9999.ebuild
18 +++ b/media-libs/mesa/mesa-9999.ebuild
19 @@ -191,10 +191,7 @@ pkg_setup() {
20 }
21
22 src_prepare() {
23 - # fix for hardened pax_kernel, bug 240956
24 - [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
25 -
26 - eautoreconf
27 + [[ ${PV} == 9999 ]] && eautoreconf
28 }
29
30 multilib_src_configure() {
31 @@ -268,11 +265,9 @@ multilib_src_configure() {
32 fi
33 fi
34
35 - # x86 hardened pax_kernel needs glx-rts, bug 240956
36 + # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
37 if use pax_kernel; then
38 - myconf+="
39 - $(use_enable x86 glx-rts)
40 - "
41 + myconf+="$(use_enable x86 glx-read-only-text)"
42 fi
43
44 # on abi_x86_32 hardened we need to have asm disable