From 02038f740f159241bb3e7a1871e2fecb22da974e Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Sat, 17 Feb 2024 04:59:00 -0500 Subject: games-emulation/pcsx2: add (forced) IUSE=+clang Makes what is happening clearer to users, and gives the option to force-disable it (through /etc/portage/profile) if really wanted. Albeit doing so will currently fail to build without patches which upstream is unlikely to accept given they took a clang-only stance and ignore bugs (thus being forced). Signed-off-by: Ionen Wolkens --- games-emulation/pcsx2/metadata.xml | 5 +++++ games-emulation/pcsx2/pcsx2-1.7.5474.ebuild | 8 ++++---- games-emulation/pcsx2/pcsx2-9999.ebuild | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) (limited to 'games-emulation/pcsx2') diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml index 6e25d9d61e5b..ddf894bc0a0f 100644 --- a/games-emulation/pcsx2/metadata.xml +++ b/games-emulation/pcsx2/metadata.xml @@ -14,6 +14,11 @@ Gentoo Games Project + + Use Clang compiler to build (the only compiler that is + currently supported by upstream on Linux, do not report + bugs if force-disabled) + Enable support for the media-sound/sndio backend diff --git a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild index 5166d24d2965..9810fcf44af1 100644 --- a/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.7.5474.ebuild @@ -23,7 +23,7 @@ LICENSE=" ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain " SLOT="0" -IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland" +IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan wayland" REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support RESTRICT="!test? ( test )" @@ -65,7 +65,7 @@ DEPEND=" " BDEPEND=" dev-qt/qttools:6[linguist] - sys-devel/clang:* + clang? ( sys-devel/clang:* ) wayland? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules @@ -93,10 +93,10 @@ src_prepare() { } src_configure() { - # upstream only supports clang and ignores gcc issues, e.g. + # note that upstream only supports clang and ignores gcc issues, e.g. # https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047 # (CMakeLists.txt also gives a big warning if compiler is not clang) - if ! tc-is-clang; then + if use clang && ! tc-is-clang; then local -x CC=${CHOST}-clang CXX=${CHOST}-clang++ strip-unsupported-flags fi diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 5166d24d2965..9810fcf44af1 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -23,7 +23,7 @@ LICENSE=" ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain " SLOT="0" -IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland" +IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan wayland" REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support RESTRICT="!test? ( test )" @@ -65,7 +65,7 @@ DEPEND=" " BDEPEND=" dev-qt/qttools:6[linguist] - sys-devel/clang:* + clang? ( sys-devel/clang:* ) wayland? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules @@ -93,10 +93,10 @@ src_prepare() { } src_configure() { - # upstream only supports clang and ignores gcc issues, e.g. + # note that upstream only supports clang and ignores gcc issues, e.g. # https://github.com/PCSX2/pcsx2/issues/10624#issuecomment-1890326047 # (CMakeLists.txt also gives a big warning if compiler is not clang) - if ! tc-is-clang; then + if use clang && ! tc-is-clang; then local -x CC=${CHOST}-clang CXX=${CHOST}-clang++ strip-unsupported-flags fi -- cgit v1.2.3-65-gdbad