summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-08-17 02:44:47 +0100
committerSam James <sam@gentoo.org>2021-09-17 20:55:26 +0100
commit10f72b03c4cd2ee737367663c7598fa0e9e0b1fd (patch)
tree2536aa171de758b13e5cadb4c1b9bac7fb7125b1 /games-engines/devilutionx
parentnet-mail/rss2email: enable py3.9, py3.10 (diff)
downloadgentoo-10f72b03c4cd2ee737367663c7598fa0e9e0b1fd.tar.gz
gentoo-10f72b03c4cd2ee737367663c7598fa0e9e0b1fd.tar.bz2
gentoo-10f72b03c4cd2ee737367663c7598fa0e9e0b1fd.zip
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@gentoo.org>
Diffstat (limited to 'games-engines/devilutionx')
-rw-r--r--games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild (renamed from games-engines/devilutionx/devilutionx-1.2.1.ebuild)4
-rw-r--r--games-engines/devilutionx/devilutionx-9999.ebuild4
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
index 01125c9e7e42..17884b883e85 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 01125c9e7e42..17884b883e85 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"
)