1 |
commit: 6cdb9464dd46d6c8c3ce945632c2355281d16ac8 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 28 13:09:15 2017 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 28 13:10:45 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdb9464 |
7 |
|
8 |
media-libs/libsdl: fix for Prefix, bug #607178 |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
|
12 |
media-libs/libsdl/libsdl-1.2.15-r9.ebuild | 10 +++++----- |
13 |
1 file changed, 5 insertions(+), 5 deletions(-) |
14 |
|
15 |
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild |
16 |
index ff07999..56cb5e3 100644 |
17 |
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild |
18 |
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 1999-2015 Gentoo Foundation |
21 |
+# Copyright 1999-2017 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
# $Id$ |
24 |
|
25 |
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz" |
26 |
|
27 |
LICENSE="LGPL-2.1" |
28 |
SLOT="0" |
29 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" |
30 |
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
31 |
# WARNING: |
32 |
# If you turn on the custom-cflags use flag in USE and something breaks, |
33 |
# you pick up the pieces. Be prepared for bug reports to be marked INVALID. |
34 |
@@ -74,12 +74,12 @@ src_prepare() { |
35 |
"${FILESDIR}"/${P}-const-xdata32.patch \ |
36 |
"${FILESDIR}"/${P}-caca.patch \ |
37 |
"${FILESDIR}"/${P}-SDL_EnableUNICODE.patch |
38 |
- AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf |
39 |
+ AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf |
40 |
} |
41 |
|
42 |
multilib_src_configure() { |
43 |
local myconf= |
44 |
- if use !x86 ; then |
45 |
+ if [[ $(tc-arch) != "x86" ]] ; then |
46 |
myconf="${myconf} --disable-nasm" |
47 |
else |
48 |
myconf="${myconf} --enable-nasm" |
49 |
@@ -92,7 +92,7 @@ multilib_src_configure() { |
50 |
use joystick || myconf="${myconf} --disable-joystick" |
51 |
|
52 |
ECONF_SOURCE="${S}" econf \ |
53 |
- --disable-rpath \ |
54 |
+ $(use_enable prefix rpath) \ |
55 |
--disable-arts \ |
56 |
--disable-esd \ |
57 |
--enable-events \ |