public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: Fix dlopen patch

This commit is contained in:
William A. Kennington III 2015-07-17 18:33:19 -07:00
parent be48876349
commit 7fe69244af
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
View File

@ -1,13 +1,28 @@
diff --git a/src/loader/loader.c b/src/loader/loader.c diff --git a/src/loader/loader.c b/src/loader/loader.c
index 666d015..4d7a9be 100644 index 4fdf3c2..0cd62b5 100644
--- a/src/loader/loader.c --- a/src/loader/loader.c
+++ b/src/loader/loader.c +++ b/src/loader/loader.c
@@ -101,7 +101,7 @@ static void * @@ -112,7 +112,6 @@ static void *udev_handle = NULL;
static void *
udev_dlopen_handle(void) udev_dlopen_handle(void)
{ {
if (!udev_handle) { - char name[80];
- udev_handle = dlopen("libudev.so.1", RTLD_LOCAL | RTLD_LAZY); unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY;
+ udev_handle = dlopen("@udev@/lib/libudev.so.1", RTLD_LOCAL | RTLD_LAZY); int version;
if (!udev_handle) { @@ -125,12 +124,9 @@ udev_dlopen_handle(void)
/* libudev.so.1 changed the return types of the two unref functions
/* First try opening an already linked libudev, then try loading one */
do {
- for (version = 1; version >= 0; version--) {
- snprintf(name, sizeof(name), "libudev.so.%d", version);
- udev_handle = dlopen(name, flags);
- if (udev_handle)
- return udev_handle;
- }
+ udev_handle = dlopen("@udev@/lib/libudev.so", flags);
+ if (udev_handle)
+ return udev_handle;
if ((flags & RTLD_NOLOAD) == 0)
break;