From nobody Fri Apr 01 18:40:03 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4F1EE1A4504C; Fri, 1 Apr 2022 18:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KVTVq6v3Hz3HNS; Fri, 1 Apr 2022 18:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648838404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EaGqGdgAG16BuX4x1IbZTqc7iFvWbMJbRrNRIgKMiGk=; b=Ru+ufOF/SLmzT61WRNQnkb3sLFMNHanRnWh6i2NAnjW8MyafaYwCUjMzMNeN6R2HgP8WfX YRmBmkx6K534D8FlLh2BeeDpnEcXy8y0w0sTmZCAzu+TCAN5S8DwDGYFfWY6v/WLtr36pW 52ovQPR4hh179vWuUl1c3kkFfaIihTQBLE6Z/lUARV/T6Z5xWPmjuVlBg+vWVqRz4lzXMV jaB5QhFxezkD1PyKVhS3R6Joang9fOZVkrDnLBv/OiuJp+UyGjVIsHNwu6qqtBy6IYBMXO EPQ176jVJsAB52Vdh37z2OeIHdZw5qBR8XIVr5fiQzlcwSu3N+kqC+A2218Scg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8CF8E19763; Fri, 1 Apr 2022 18:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 231Ie3NN050365; Fri, 1 Apr 2022 18:40:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 231Ie3rY050363; Fri, 1 Apr 2022 18:40:03 GMT (envelope-from git) Date: Fri, 1 Apr 2022 18:40:03 GMT Message-Id: <202204011840.231Ie3rY050363@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 7b2e0e300cb0 - main - emulators/yuzu: unbreak with kern.elf64.allow_wx=0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b2e0e300cb06a624ad5e52064954681b4ac5489 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648838404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EaGqGdgAG16BuX4x1IbZTqc7iFvWbMJbRrNRIgKMiGk=; b=UnUZd/HKqdLjNrwHEIx0v34JI3CU8f3qc1DbKEnw1Et/J7HK+6tiZZ23Kj4L+v2XHRRP/U pnhEek40QVVPhqXU3Y+xqNxqk1HqShpiEC+pSnHNIRP/30Afx6ClynWeWPX8/pEV4n2Gvy DVIXZ5hkju74BEYUbE57V3P2kHeoPURh08SYT8RMeULdOl/c//ebBNTTNYyrOLQaRo/AuW 782MVmGGHXrf3zdMj2ehyc+mJuoQvaR9cW2kHkOc5c/O7n1IlUiQa9rsSy+19/CuJuuCHT x7YzvJMA5uA0Cvgro+BgVuwqXnlkOB14P63SbLbFYM1VMZTgOEWuvArdMAm07A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648838404; a=rsa-sha256; cv=none; b=qzwVGwo/3VgXItb3oQTuqaNuR6N09OALD340UzuTM2WjWcKbOLz60CJACq9+Q/S1Q6Pwma Xp+Z7DrLTncRJwkNbnE03Lu9Dqj214BzQCSI95tTjWG+QDIcCdUuqUgExyDzgpj+6R8glF TlauKq5Lju5a7JMXYjg9UsArHk2fN4NpmbBPK8qXwGRw/RRu2NkKZY3yf1OwGT1Ores2jF AlFpimzpIL87GsQOc2bqQxpqwfYYkKJhqZZ2F+53hIE6jqgjMMVuPBEqpi5LO8WhhAUH7Y Z7CAVmInOzNyqMCE/mQpzA6iya7czckHEkH/xOX8w9RwOW6yzTEQM+UGoFwyFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b2e0e300cb06a624ad5e52064954681b4ac5489 commit 7b2e0e300cb06a624ad5e52064954681b4ac5489 Author: Jan Beich AuthorDate: 2022-04-01 17:28:56 +0000 Commit: Jan Beich CommitDate: 2022-04-01 18:39:29 +0000 emulators/yuzu: unbreak with kern.elf64.allow_wx=0 $ yuzu terminate called after throwing an instance of 'Xbyak::Error' what(): can't protect Abort trap --- emulators/yuzu/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 0f2d1c797025..fe3d8edb19d1 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -56,7 +56,7 @@ GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ kinetiknz:cubeb:cubeb-0.2-1350-gf79e0cf:cubeb/externals/cubeb \ yhirose:cpp-httplib:v0.9.0-5-g9648f95:cpp_httplib/externals/cpp-httplib -USES= cmake:testing compiler:c++17-lang localbase:ldflags pkgconfig sdl ssl +USES= cmake:testing compiler:c++17-lang elfctl localbase:ldflags pkgconfig sdl ssl USE_GCC= yes:build # libc++ lacks std::atomic_ref, std::ranges USE_SDL= sdl2 CMAKE_ON= Boost_USE_STATIC_LIBS @@ -66,6 +66,7 @@ CMAKE_OFF+= ${CMAKE_TESTING_ON} CMAKE_TESTING_ON= YUZU_TESTS LDFLAGS+= -static-libstdc++ # avoid libc++ conflict, requires files/patch-fmt LDFLAGS+= -Wl,--as-needed # Qt5Network +ELF_FEATURES= ${PLIST_FILES:Mbin/*:S/^/+wxneeded:/} PLIST_FILES= bin/${PORTNAME}-cmd OPTIONS_DEFINE= ALSA PULSEAUDIO JACK NLS QT5 SNDIO VAAPI VULKAN WEBENGINE