From 1e8f44e3fce6b1557bc48786ed9839169dff20f9 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 26 Nov 2013 16:19:52 -0800
Subject: [PATCH] fix(check_deps): Depend exclusively on ld.so.conf for lib
 list

The list in ld.so.conf needs to be complete so don't bother with
including other hard-coded paths or the path to ld-linux-x86-64.so.2.
---
 build_library/check_deps | 39 ++++++---------------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/build_library/check_deps b/build_library/check_deps
index 47257855f5..e72975c250 100755
--- a/build_library/check_deps
+++ b/build_library/check_deps
@@ -29,7 +29,7 @@ class CheckDependencies(object):
       A list of valid libdirs.
     """
 
-    libdirs = []
+    libdirs = set()
 
     ld_so_conf = self._root + path
     if os.path.exists(ld_so_conf):
@@ -41,14 +41,14 @@ class CheckDependencies(object):
         if line.startswith("/"):
           libpath = self._root + line
           if os.path.exists(libpath):
-            libdirs.append(libpath)
+            libdirs.add(libpath)
 
         elif line.startswith("include "):
           # Includes are absolute or relative to the file itself.
           line = os.path.join(os.path.dirname(path), line[8:])
           for p in glob.glob(self._root + line):
             rel_p = "/%s" % os.path.relpath(p, self._root)
-            libdirs.extend(self._ReadLdSoConf(rel_p))
+            libdirs.update(self._ReadLdSoConf(rel_p))
 
       f.close()
 
@@ -66,36 +66,9 @@ class CheckDependencies(object):
     self._libcache = set()
     self._verbose = verbose
 
-    libdirs = []
-
-    # Add the native paths. Get the ELF interpreter from a known file
-    # and assume that the path it is in is our native libdir. So here
-    # we would get something like "/lib64/ld-linux-x86-64.so.2".
-    elf = "/bin/sh"
-    f = os.popen("scanelf -qF'%%i#p' %s/%s" % (root, elf))
-    native_libdir = os.path.dirname(f.readline().rstrip())
-    f.close()
-    if len(native_libdir) == 0:
-      print >>sys.stderr, "Problem with %s: can't find ELF interp" % elf
-      sys.exit(1)
-    elif native_libdir != "/lib":
-      libdirs.extend([
-        "%s/%s" % (root, native_libdir),
-        "%s/usr%s" % (root, native_libdir)
-      ])
-
-    # Insert some default directories into our library cache.
-    libdirs.extend([
-      "%s/lib" % root,
-      "%s/usr/lib" % root,
-      "%s/opt/google/o3d/lib" % root,
-      "%s/usr/lib/opengl/xorg-x11/lib" % root,
-      "%s/usr/local/lib/icedtea6/jre/lib/i386/client" % root,
-      "%s/usr/local/lib/icedtea6/jre/lib/i386/headless" % root
-    ])
-
-    # Read more directories from ld.so.conf.
-    libdirs.extend(self._ReadLdSoConf("/etc/ld.so.conf"))
+    libdirs = self._ReadLdSoConf("/etc/ld.so.conf")
+    if self._verbose:
+        print "Library search path: %s" % " ".join(sorted(libdirs))
 
     self._ReadLibs(libdirs, self._libcache)