| 1 |
commit: 10f72b03c4cd2ee737367663c7598fa0e9e0b1fd |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 17 01:44:47 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 17 19:55:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f72b03 |
| 7 |
|
| 8 |
games-engines/devilutionx: use dynamic linking (fixes libsodium build) |
| 9 |
|
| 10 |
-DDIST controls whether devilutionx links dynamically to libraries |
| 11 |
(only SDL 2 and glibc are linked dynamically otherwise). |
| 12 |
|
| 13 |
For later versions of libsodium, FindSodium.cmake malfunctions and |
| 14 |
does not correctly populate all the needed variables. For Gentoo's |
| 15 |
purposes, we can ignore this problem, and instead force dynamic |
| 16 |
linking (which is policy anyway). |
| 17 |
|
| 18 |
A fix to use a supported method to detect libsodium (pkg-config) |
| 19 |
is being pursued upstream. |
| 20 |
|
| 21 |
Maintainer timeout. |
| 22 |
|
| 23 |
Bug: https://github.com/diasurgical/devilutionX/issues/2615 |
| 24 |
Closes: https://bugs.gentoo.org/791031 |
| 25 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 26 |
|
| 27 |
.../{devilutionx-1.2.1.ebuild => devilutionx-1.2.1-r1.ebuild} | 4 +++- |
| 28 |
games-engines/devilutionx/devilutionx-9999.ebuild | 4 +++- |
| 29 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 30 |
|
| 31 |
diff --git a/games-engines/devilutionx/devilutionx-1.2.1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild |
| 32 |
similarity index 94% |
| 33 |
rename from games-engines/devilutionx/devilutionx-1.2.1.ebuild |
| 34 |
rename to games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild |
| 35 |
index 01125c9e7e4..17884b883e8 100644 |
| 36 |
--- a/games-engines/devilutionx/devilutionx-1.2.1.ebuild |
| 37 |
+++ b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild |
| 38 |
@@ -50,7 +50,9 @@ src_configure() { |
| 39 |
-DASAN="OFF" |
| 40 |
-DDEBUG="$(usex debug)" |
| 41 |
-DDISABLE_LTO="$(usex !lto)" |
| 42 |
- -DDIST="ON" |
| 43 |
+ # Must be off to force dynamic linking. |
| 44 |
+ # See bug #791031 |
| 45 |
+ -DDIST="OFF" |
| 46 |
-DUBSAN="OFF" |
| 47 |
) |
| 48 |
|
| 49 |
|
| 50 |
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild |
| 51 |
index 01125c9e7e4..17884b883e8 100644 |
| 52 |
--- a/games-engines/devilutionx/devilutionx-9999.ebuild |
| 53 |
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild |
| 54 |
@@ -50,7 +50,9 @@ src_configure() { |
| 55 |
-DASAN="OFF" |
| 56 |
-DDEBUG="$(usex debug)" |
| 57 |
-DDISABLE_LTO="$(usex !lto)" |
| 58 |
- -DDIST="ON" |
| 59 |
+ # Must be off to force dynamic linking. |
| 60 |
+ # See bug #791031 |
| 61 |
+ -DDIST="OFF" |
| 62 |
-DUBSAN="OFF" |
| 63 |
) |
Archives