On Mon Aug 29, 2022 at 02:15:40PM +0100, Stuart Henderson wrote:
> On 2022/08/29 14:34, Antoine Jacoutot wrote:
> > Hi.
> >
> > Now that we have RTLD_NOLOAD, we should be able to remove this patch.
>
> OK. Brad sent the same to thfr@ and cc'd me on the 20th so I think
> that's a reasonable timeout.
I tested fs2open with the diff below. OK rsadowski
>
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/games/fs2open/Makefile,v
> > retrieving revision 1.14
> > diff -u -p -r1.14 Makefile
> > --- Makefile 20 Aug 2022 06:27:04 -0000 1.14
> > +++ Makefile 29 Aug 2022 12:33:08 -0000
> > @@ -8,6 +8,7 @@ DISTNAME = fs2open-${V}
> > GH_ACCOUNT = scp-fs2open
> > GH_PROJECT = fs2open.github.com
> > GH_TAGNAME = release_${V:S/./_/g}
> > +REVISION = 0
> >
> > CATEGORIES = games
> >
> > Index: patches/patch-code_libs_renderdoc_renderdoc_cpp
> > ===================================================================
> > RCS file: patches/patch-code_libs_renderdoc_renderdoc_cpp
> > diff -N patches/patch-code_libs_renderdoc_renderdoc_cpp
> > --- patches/patch-code_libs_renderdoc_renderdoc_cpp 11 Mar 2022 19:04:26
> > -0000 1.2
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,14 +0,0 @@
> > -we don't have RTLD_NOLOAD
> > -
> > -Index: code/libs/renderdoc/renderdoc.cpp
> > ---- code/libs/renderdoc/renderdoc.cpp.orig
> > -+++ code/libs/renderdoc/renderdoc.cpp
> > -@@ -14,7 +14,7 @@ RENDERDOC_API_1_1_1* api = nullptr;
> > -
> > - pRENDERDOC_GetAPI load_getAPI() {
> > - #ifdef SCP_UNIX
> > -- auto handle = dlopen("librenderdoc.so", RTLD_NOLOAD);
> > -+ auto handle = dlopen("librenderdoc.so", RTLD_LAZY);
> > - auto symbol = dlsym(handle, "RENDERDOC_GetAPI");
> > -
> > - if (handle != nullptr) {
> >
> > --
> > Antoine
> >
>
