From dbe235e5d85a9e1ea5d987a8fb0f2f15e0f03c65 Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Tue, 28 Sep 2004 07:56:49 +0000 Subject: 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. --- utils/ldd.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'utils') 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; -- cgit v1.2.3