diff options
| author |   Yuri Konotopov <ykonotopov@gnome.org> | 2017-01-09 23:24:29 +0400 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-01-18 11:45:56 +0100 |
| commit | 97658bc43cdb51c3159562d76312e0fc1689c9a6 (patch) | |
| tree | 045b5ea7aba40936bdd10b34bc1e67c49c76f849 /games-emulation | |
| parent | sys-kernel/gentoo-sources: arm stable wrt bug #598378 (diff) | |
| download | gentoo-97658bc43cdb51c3159562d76312e0fc1689c9a6.tar.gz gentoo-97658bc43cdb51c3159562d76312e0fc1689c9a6.tar.bz2 gentoo-97658bc43cdb51c3159562d76312e0fc1689c9a6.zip | |
games-emulation/pcsx2: fixed compilation with gcc 5
Gentoo-Bug: https://bugs.gentoo.org/605162
Closes: https://github.com/gentoo/gentoo/pull/3402
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch | 26 | ||||
| -rw-r--r-- | games-emulation/pcsx2/pcsx2-1.4.0.ebuild | 4 |
2 files changed, 29 insertions, 1 deletions
diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch new file mode 100644 index 000000000000..cfc941f28244 --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch @@ -0,0 +1,26 @@ +From 71991f24ef75b7da678d8de8d593bf82677d2708 Mon Sep 17 00:00:00 2001 +From: Yuri Konotopov <ykonotopov@gnome.org> +Date: Mon, 9 Jan 2017 18:37:44 +0400 +Subject: [PATCH] x86emitter: gcc 5 compilation fix + +--- + common/src/x86emitter/cpudetect.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp +index 717ca89..cf94d7f 100644 +--- a/common/src/x86emitter/cpudetect.cpp ++++ b/common/src/x86emitter/cpudetect.cpp +@@ -16,6 +16,9 @@ + #include "PrecompiledHeader.h" + #include "cpudetect_internal.h" + #include "internal.h" ++#if defined(__GNUC__) ++#include "x86intrin.h" ++#endif + + using namespace x86Emitter; + +-- +2.10.2 + diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild index 205910c21c76..d18fd53fc9cb 100644 --- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -44,6 +44,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${PN}-${MY_PV}" +PATCHES=( "${FILESDIR}"/${P}-gcc5.patch ) + clean_locale() { rm -R "${S}"/locales/"${1}" || die } |