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 4AFF5158092 for ; Fri, 17 Sep 2021 19:56:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DCD8E0841; Fri, 17 Sep 2021 19:56:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45FCBE0841 for ; Fri, 17 Sep 2021 19:56:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2B43342E32 for ; Fri, 17 Sep 2021 19:56:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 102AFD5 for ; Fri, 17 Sep 2021 19:56:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1631908526.10f72b03c4cd2ee737367663c7598fa0e9e0b1fd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild games-engines/devilutionx/devilutionx-1.2.1.ebuild games-engines/devilutionx/devilutionx-9999.ebuild X-VCS-Directories: games-engines/devilutionx/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 10f72b03c4cd2ee737367663c7598fa0e9e0b1fd X-VCS-Branch: master Date: Fri, 17 Sep 2021 19:56:23 +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: 9ec43409-b2b5-47ba-ac6e-21814d24344c X-Archives-Hash: 1a6fc6eb84b757452210c24a2f6b4829 commit: 10f72b03c4cd2ee737367663c7598fa0e9e0b1fd Author: Sam James gentoo org> AuthorDate: Tue Aug 17 01:44:47 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 17 19:55:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f72b03 games-engines/devilutionx: use dynamic linking (fixes libsodium build) -DDIST controls whether devilutionx links dynamically to libraries (only SDL 2 and glibc are linked dynamically otherwise). For later versions of libsodium, FindSodium.cmake malfunctions and does not correctly populate all the needed variables. For Gentoo's purposes, we can ignore this problem, and instead force dynamic linking (which is policy anyway). A fix to use a supported method to detect libsodium (pkg-config) is being pursued upstream. Maintainer timeout. Bug: https://github.com/diasurgical/devilutionX/issues/2615 Closes: https://bugs.gentoo.org/791031 Signed-off-by: Sam James gentoo.org> .../{devilutionx-1.2.1.ebuild => devilutionx-1.2.1-r1.ebuild} | 4 +++- games-engines/devilutionx/devilutionx-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/games-engines/devilutionx/devilutionx-1.2.1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild similarity index 94% rename from games-engines/devilutionx/devilutionx-1.2.1.ebuild rename to games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild index 01125c9e7e4..17884b883e8 100644 --- a/games-engines/devilutionx/devilutionx-1.2.1.ebuild +++ b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild @@ -50,7 +50,9 @@ src_configure() { -DASAN="OFF" -DDEBUG="$(usex debug)" -DDISABLE_LTO="$(usex !lto)" - -DDIST="ON" + # Must be off to force dynamic linking. + # See bug #791031 + -DDIST="OFF" -DUBSAN="OFF" ) diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild index 01125c9e7e4..17884b883e8 100644 --- a/games-engines/devilutionx/devilutionx-9999.ebuild +++ b/games-engines/devilutionx/devilutionx-9999.ebuild @@ -50,7 +50,9 @@ src_configure() { -DASAN="OFF" -DDEBUG="$(usex debug)" -DDISABLE_LTO="$(usex !lto)" - -DDIST="ON" + # Must be off to force dynamic linking. + # See bug #791031 + -DDIST="OFF" -DUBSAN="OFF" )