[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

["Sam James" <sam@gentoo.org>]

commit:     10f72b03c4cd2ee737367663c7598fa0e9e0b1fd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 01:44:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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"
 	)