Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 737935 Details for
Bug 791031
games-engines/devilutionx-1.2.1 fails to compile with >=dev-libs/libsodium-1.0.18_p20210421
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
devilutionx-dynamic-linking.patch
file_791031.txt (text/plain), 3.71 KB, created by
Sam James
on 2021-09-06 16:22:14 UTC
(
hide
)
Description:
devilutionx-dynamic-linking.patch
Filename:
MIME Type:
Creator:
Sam James
Created:
2021-09-06 16:22:14 UTC
Size:
3.71 KB
patch
obsolete
>From a244ff7988b9fa1cf889de0570117bfba86e3aa0 Mon Sep 17 00:00:00 2001 >From: Sam James <sam@gentoo.org> >Date: Tue, 17 Aug 2021 02:44:47 +0100 >Subject: [PATCH 1/2] 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. > >Bug: https://github.com/diasurgical/devilutionX/issues/2615 >Closes: https://bugs.gentoo.org/791031 >Signed-off-by: Sam James <sam@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(-) > rename games-engines/devilutionx/{devilutionx-1.2.1.ebuild => devilutionx-1.2.1-r1.ebuild} (94%) > >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 01125c9e7e42d..17884b883e855 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 01125c9e7e42d..17884b883e855 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" > ) > > >From 6e02109dbfb6f2bba126dcdb9b3b9196e369bbb2 Mon Sep 17 00:00:00 2001 >From: Sam James <sam@gentoo.org> >Date: Tue, 17 Aug 2021 02:49:35 +0100 >Subject: [PATCH 2/2] games-engines/devilutionx: subscribe to libsodium subslot > >We need to be rebuilt when the subslot (ABI) of libsodium changes. > >Signed-off-by: Sam James <sam@gentoo.org> >--- > games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild | 2 +- > games-engines/devilutionx/devilutionx-9999.ebuild | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild >index 17884b883e855..9dd19f639bcb1 100644 >--- a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild >+++ b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild >@@ -28,7 +28,7 @@ SLOT="0" > IUSE="debug lto" > > RDEPEND=" >- dev-libs/libsodium >+ dev-libs/libsodium:= > media-fonts/sil-charis > media-libs/libsdl2[haptic] > media-libs/sdl2-mixer >diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild >index 17884b883e855..9dd19f639bcb1 100644 >--- a/games-engines/devilutionx/devilutionx-9999.ebuild >+++ b/games-engines/devilutionx/devilutionx-9999.ebuild >@@ -28,7 +28,7 @@ SLOT="0" > IUSE="debug lto" > > RDEPEND=" >- dev-libs/libsodium >+ dev-libs/libsodium:= > media-fonts/sil-charis > media-libs/libsdl2[haptic] > media-libs/sdl2-mixer
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 791031
:
709752
| 737935