gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

games-emulation/dolphin: unconditionally disable llvm, bug #594940

Browse Source 
llvm is used only for debug disassembly and is not detected
by cmake scripts for various reasons.

Let's sort llvm detection upstream first and restore downstream later.

Reported-by: Michał Górny
Closes: https://bugs.gentoo.org/594940
Package-Manager: Portage-2.3.43, Repoman-2.3.10
This commit is contained in:
Sergei Trofimovich
2018-07-28 18:25:14 +01:00
parent cd514ed669
commit 97a3987ca1
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
games-emulation/dolphin/dolphin-5.0.ebuild
View File

@@ -17,7 +17,9 @@ HOMEPAGE="https://www.dolphin-emu.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
RESTRICT=test
RDEPEND="
>=media-libs/libsfml-2.1
@@ -44,7 +46,6 @@ RDEPEND="
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:= )
)
llvm? ( sys-devel/llvm:* )
openal? (
media-libs/openal
media-libs/libsoundtouch
@@ -89,9 +90,10 @@ src_prepare() {
if use !bluetooth; then
sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
fi
if use !llvm; then
sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
fi
# Unconditionally disable LLVM disassembler.
sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
if use !openal; then
sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
fi

7
games-emulation/dolphin/dolphin-9999.ebuild
View File

@@ -22,7 +22,7 @@ HOMEPAGE="https://www.dolphin-emu.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav llvm log lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp"
IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav log lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp"
RDEPEND="
>=media-libs/libsfml-2.1
@@ -52,7 +52,6 @@ RDEPEND="
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:= )
)
llvm? ( sys-devel/llvm:* )
openal? (
media-libs/openal
media-libs/libsoundtouch
@@ -89,9 +88,6 @@ src_prepare() {
if use !bluetooth; then
sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
fi
if use !llvm; then
sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
fi
if use !openal; then
sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
fi
@@ -152,6 +148,7 @@ src_configure() {
-DOPROFILING=$(usex profile)
-DENABLE_EVDEV=$(usex evdev)
-DENABLE_LLVM=OFF
-DENABLE_LTO=$(usex lto)
-DENABLE_QT=$(usex qt5)
-DENABLE_SDL=$(usex sdl)

1
games-emulation/dolphin/metadata.xml
View File

@@ -8,7 +8,6 @@
<flag name="discord-presence">Enables Discord Rich Presence, show the current game on Discord</flag>
<flag name="egl">Enable EGL support</flag>
<flag name="evdev">Enable evdev input support</flag>
<flag name="llvm">Enable the LLVM-based disassembler for debugger mode</flag>
<flag name="log">Increase logging output</flag>
<flag name="lto">Add support for link-time optimizations.</flag>
</use>