From 0c91a787b60e3a8804c1001724b039a0b80c7bb4 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 18 Mar 2004 11:17:14 +0000
Subject: Look in /usr/X11R6/lib as well

---
 ldso/ldso/dl-elf.c | 2 +-
 utils/ldd.c        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 8a3fa6d20..3341fdd80 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -358,6 +358,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
 					UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:"
 					UCLIBC_RUNTIME_PREFIX "usr/lib:"
 					UCLIBC_RUNTIME_PREFIX "lib:"
+					"/usr/X11R6/lib:"
 					"/usr/lib:"
 					"/lib", rpnt)
 		) != NULL)
@@ -924,4 +925,3 @@ void *_dl_malloc(int size)
 }
 
 
-
diff --git a/utils/ldd.c b/utils/ldd.c
index 777a99382..977ce8b2c 100644
--- a/utils/ldd.c
+++ b/utils/ldd.c
@@ -341,6 +341,7 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_suid, stru
 	path =	UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:"
 		UCLIBC_RUNTIME_PREFIX "usr/lib:"
 		UCLIBC_RUNTIME_PREFIX "lib:"
+		"/usr/X11R6/lib:"
 		"/usr/lib:"
 		"/lib";
 	search_for_named_library(lib->name, buf, path);
-- 
cgit v1.2.3