mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compile in the ALSA search path instead of relying on ld.so.conf.

Browse source 
The Ubuntu package currently uses ld.so.conf.d fragments to add
/usr/lib/alsa-lib and /usr/lib{32,64}/alsa-lib to the dlopen search path.
These don't *belong* on the global search path, and it becomes much more
problematic to put them there with the advent of multiarch because each
architecture then needs its own distinct config file to add the separate
path... which is then also put in the global library namespace.  Instead,
let ALSA make use of the already defined ALSA_PLUGIN_DIR to look up
plugins.

Signed-off-by: Jordi Mallach <jordi@debian.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Steve Langasek 2013-05-15 19:05:59 +02:00 • committed by Takashi Iwai
parent 2b84ab0514
commit b906db19ef
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/dlmisc.c
View file

@ -67,7 +67,25 @@ void *snd_dlopen(const char *name, int mode)
#endif
#endif
#ifdef HAVE_LIBDL
return dlopen(name, mode);
/*
* Handle the plugin dir not being on the default dlopen search
* path, without resorting to polluting the entire system namespace
* via ld.so.conf.
*/
void *handle = NULL;
char *filename;
if (name && name[0] != '/') {
filename = malloc(sizeof(ALSA_PLUGIN_DIR) + 1 + strlen(name) + 1);
strcpy(filename, ALSA_PLUGIN_DIR);
strcat(filename, "/");
strcat(filename, name);
handle = dlopen(filename, mode);
free(filename);
}
if (!handle)
handle = dlopen(name, mode);
return handle;
#else
return NULL;
#endif