diff options
| author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-09-28 07:56:49 +0000 |
|---|---|---|
| committer | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-09-28 07:56:49 +0000 |
| commit | dbe235e5d85a9e1ea5d987a8fb0f2f15e0f03c65 (patch) | |
| tree | 7eb50fc5e5bff44c69409d725002af13e2d55362 | |
| parent | 83774a2dac04821b14791095d71f128c3f999336 (diff) | |
Remove /usr/X11R6/lib from search path.
Search in UCLIBC_RUNTIME_PREFIX"lib" before
UCLIBC_RUNTIME_PREFIX"usr/lib".
X11 users should enable USE_CACHE in Rules.mak, add
/usr/X11R6/lib to /etc/ld.so.conf and run ldconfig.
| -rw-r--r-- | ldso/ldso/dl-elf.c | 7 | ||||
| -rw-r--r-- | utils/ldd.c | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index c58ca5dfb..019acaac8 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -356,12 +356,9 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt, if(_dl_debug) _dl_dprintf(_dl_debug_file, "\tsearching full lib path list\n"); #endif if ((tpnt1 = search_for_named_library(libname, secure, - UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:" - UCLIBC_RUNTIME_PREFIX "usr/lib:" UCLIBC_RUNTIME_PREFIX "lib:" - "/usr/X11R6/lib:" - "/usr/lib:" - "/lib", rpnt) + UCLIBC_RUNTIME_PREFIX "usr/lib" + , rpnt) ) != NULL) { return tpnt1; diff --git a/utils/ldd.c b/utils/ldd.c index 47bdce43f..b5ca0b615 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -338,12 +338,8 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_suid, stru /* Lastly, search the standard list of paths for the library. This list must exactly match the list in uClibc/ldso/ldso/dl-elf.c */ - path = UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:" - UCLIBC_RUNTIME_PREFIX "usr/lib:" - UCLIBC_RUNTIME_PREFIX "lib:" - "/usr/X11R6/lib:" - "/usr/lib:" - "/lib"; + path = UCLIBC_RUNTIME_PREFIX "lib:" + UCLIBC_RUNTIME_PREFIX "usr/lib"; search_for_named_library(lib->name, buf, path); if (*buf != '\0') { lib->path = buf; |