50bab4cf0c
Copy from X11:XOrg/xorg-x11-server based on submit request 20273 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/20273 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=139
26 lines
961 B
Diff
26 lines
961 B
Diff
Index: xorg-server-1.6.3.901/hw/xfree86/loader/dlloader.c
|
|
===================================================================
|
|
--- xorg-server-1.6.3.901.orig/hw/xfree86/loader/dlloader.c
|
|
+++ xorg-server-1.6.3.901/hw/xfree86/loader/dlloader.c
|
|
@@ -120,7 +120,7 @@ DLFindSymbol(const char *name)
|
|
}
|
|
|
|
if (!global_scope)
|
|
- global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);
|
|
+ global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL | RTLD_DEEPBIND);
|
|
|
|
if (global_scope)
|
|
return DLFindSymbolLocal(global_scope, name);
|
|
@@ -136,9 +136,9 @@ DLLoadModule(loaderPtr modrec, int flags
|
|
int dlopen_flags;
|
|
|
|
if (flags & LD_FLAG_GLOBAL)
|
|
- dlopen_flags = DLOPEN_LAZY | DLOPEN_GLOBAL;
|
|
+ dlopen_flags = DLOPEN_LAZY | DLOPEN_GLOBAL | RTLD_DEEPBIND;
|
|
else
|
|
- dlopen_flags = DLOPEN_LAZY;
|
|
+ dlopen_flags = DLOPEN_LAZY | RTLD_DEEPBIND;
|
|
dlfile = dlopen(modrec->name, dlopen_flags);
|
|
if (dlfile == NULL) {
|
|
ErrorF("dlopen: %s\n", dlerror());
|