From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EFCE21382C5 for ; Fri, 15 Jan 2021 08:44:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AC68E0886; Fri, 15 Jan 2021 08:44:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01B34E0886 for ; Fri, 15 Jan 2021 08:44:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05081340E85 for ; Fri, 15 Jan 2021 08:44:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 702C2496 for ; Fri, 15 Jan 2021 08:44:54 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1610700277.2fb6595fb15e93b8c04a59034a27d517fcde3030.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/pcsx2/pcsx2-9999.ebuild X-VCS-Directories: games-emulation/pcsx2/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 2fb6595fb15e93b8c04a59034a27d517fcde3030 X-VCS-Branch: master Date: Fri, 15 Jan 2021 08:44:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e5b010bc-8879-4948-8c8d-ff89acf408c9 X-Archives-Hash: be5283a575e92be071c1c89a34150007 commit: 2fb6595fb15e93b8c04a59034a27d517fcde3030 Author: Yuri Konotopov gnome org> AuthorDate: Fri Jan 8 11:07:20 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Jan 15 08:44:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb6595f games-emulation/pcsx2: switch to native build on amd64 Closes: https://bugs.gentoo.org/740250 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Yuri Konotopov gnome.org> Co-authored-by: Ionen Wolkens gmail.com> Signed-off-by: Ionen Wolkens gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18931 Signed-off-by: Joonas Niilola gentoo.org> games-emulation/pcsx2/pcsx2-9999.ebuild | 51 ++++++++++++++------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index c6a8c52c162..192f835dfe6 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake fcaps flag-o-matic git-r3 multilib toolchain-funcs wxwidgets +inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets DESCRIPTION="A PlayStation 2 emulator" HOMEPAGE="https://www.pcsx2.net" @@ -13,29 +13,28 @@ EGIT_SUBMODULES=() LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="" RDEPEND=" - app-arch/bzip2[abi_x86_32(-)] - app-arch/xz-utils[abi_x86_32(-)] - dev-cpp/yaml-cpp:=[abi_x86_32(-)] - dev-libs/libaio[abi_x86_32(-)] - dev-libs/libfmt:=[abi_x86_32(-)] - dev-libs/libxml2:2[abi_x86_32(-)] - media-libs/alsa-lib[abi_x86_32(-)] - media-libs/libpng:=[abi_x86_32(-)] - media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] - media-libs/libsoundtouch[abi_x86_32(-)] - media-libs/portaudio[abi_x86_32(-)] - net-libs/libpcap[abi_x86_32(-)] - sys-libs/zlib[abi_x86_32(-)] - virtual/libudev[abi_x86_32(-)] - virtual/opengl[abi_x86_32(-)] - x11-libs/gtk+:3[abi_x86_32(-)] - x11-libs/libICE[abi_x86_32(-)] - x11-libs/libX11[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),X] + app-arch/bzip2 + app-arch/xz-utils + dev-cpp/yaml-cpp:= + dev-libs/libaio + dev-libs/libfmt:= + dev-libs/libxml2:2 + media-libs/alsa-lib + media-libs/libpng:= + media-libs/libsdl2[haptic,joystick,sound] + media-libs/libsoundtouch + media-libs/portaudio + net-libs/libpcap + sys-libs/zlib + virtual/libudev + virtual/opengl + x11-libs/gtk+:3 + x11-libs/libICE + x11-libs/libX11 + x11-libs/libXext + x11-libs/wxGTK:3.0-gtk3[X] " DEPEND="${RDEPEND} dev-cpp/pngpp @@ -57,7 +56,6 @@ pkg_setup() { } src_configure() { - multilib_toolchain_setup x86 # Build with ld.gold fails # https://github.com/PCSX2/pcsx2/issues/1671 tc-ld-disable-gold @@ -65,13 +63,6 @@ src_configure() { # pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel # if it something other than "Devel|Debug|Release" local CMAKE_BUILD_TYPE="Release" - - if use amd64; then - # Passing correct CMAKE_TOOLCHAIN_FILE for amd64 - # https://github.com/PCSX2/pcsx2/pull/422 - local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake) - fi - local mycmakeargs=( -DARCH_FLAG= -DDISABLE_BUILD_DATE=TRUE