diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2018-07-28 18:25:14 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2018-07-28 18:25:28 +0100 |
| commit | 97a3987ca11005a9a5291d5f92f84edd4dfc88f1 (patch) | |
| tree | 7253ef6773c221fdfb00c900e74479167b660a77 /games-emulation | |
| parent | dev-python/pyenchant: bump to 2.0.0, supports enchant 2, Py3.7+PyPy3 (diff) | |
| download | gentoo-97a3987ca11005a9a5291d5f92f84edd4dfc88f1.tar.gz gentoo-97a3987ca11005a9a5291d5f92f84edd4dfc88f1.tar.bz2 gentoo-97a3987ca11005a9a5291d5f92f84edd4dfc88f1.zip | |
games-emulation/dolphin: unconditionally disable llvm, bug #594940
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
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/dolphin/dolphin-5.0.ebuild | 12 | ||||
| -rw-r--r-- | games-emulation/dolphin/dolphin-9999.ebuild | 7 | ||||
| -rw-r--r-- | games-emulation/dolphin/metadata.xml | 1 |
3 files changed, 9 insertions, 11 deletions
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild index 908b571cf426..491d92991bef 100644 --- a/games-emulation/dolphin/dolphin-5.0.ebuild +++ b/games-emulation/dolphin/dolphin-5.0.ebuild @@ -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 diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index de76dd90ee6b..b8b2dd91a858 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -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) diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml index 5a7e53ca6e42..34a2a16ae8ed 100644 --- a/games-emulation/dolphin/metadata.xml +++ b/games-emulation/dolphin/metadata.xml @@ -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> |