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: Fri, 02 Oct 2015 00:33:49
Message-Id: 1443746046.31dbbb455ea1a74d5938f6b45ddd9bdf27e6f1fc.mattst88@gentoo
1 commit: 31dbbb455ea1a74d5938f6b45ddd9bdf27e6f1fc
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 1 21:13:01 2015 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 2 00:34:06 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31dbbb45
7
8 media-libs/mesa: Fix pax_kernel USE flag.
9
10 use/use_enable x86 doesn't work when building for ABI=32 on amd64.
11
12 media-libs/mesa/mesa-9999.ebuild | 12 ++++++------
13 1 file changed, 6 insertions(+), 6 deletions(-)
14
15 diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
16 index 1ac917f..45b9daf 100644
17 --- a/media-libs/mesa/mesa-9999.ebuild
18 +++ b/media-libs/mesa/mesa-9999.ebuild
19 @@ -6,7 +6,7 @@ EAPI=5
20
21 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
22
23 -if [[ ${PV} = 9999* ]]; then
24 +if [[ ${PV} = 9999 ]]; then
25 GIT_ECLASS="git-r3"
26 EXPERIMENTAL="true"
27 fi
28 @@ -23,7 +23,7 @@ FOLDER="${PV/_rc*/}"
29 DESCRIPTION="OpenGL-like graphic library for Linux"
30 HOMEPAGE="http://mesa3d.sourceforge.net/"
31
32 -if [[ $PV == 9999* ]]; then
33 +if [[ $PV == 9999 ]]; then
34 SRC_URI=""
35 KEYWORDS=""
36 else
37 @@ -159,7 +159,7 @@ DEPEND="${RDEPEND}
38 >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
39 >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
40 "
41 -[[ ${PV} == "9999" ]] && DEPEND+="
42 +[[ ${PV} == 9999 ]] && DEPEND+="
43 sys-devel/bison
44 sys-devel/flex
45 ${PYTHON_DEPS}
46 @@ -265,9 +265,9 @@ multilib_src_configure() {
47 fi
48 fi
49
50 - # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
51 - if use pax_kernel; then
52 - myconf+="$(use_enable x86 glx-read-only-text)"
53 + # x86 hardened pax_kernel needs glx-rts, bug 240956
54 + if [[ ${ABI} == x86 ]]; then
55 + myconf+="$(use_enable pax_kernel glx-read-only-text)"
56 fi
57
58 # on abi_x86_32 hardened we need to have asm disable