Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Unified Diff: src/scripts/check_deps

Issue 1986005: Add more exceptions to check_deps to allow usage of icedtea. (Closed) Base URL: ssh://git@chromiumos-git/chromeos
Patch Set: Look in /usr/local Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/scripts/check_deps
diff --git a/src/scripts/check_deps b/src/scripts/check_deps
index 2a349d9f016b140c52e1f22d9c1e09fb670f3dc6..b15c62477ffb22fa8766930b8cf1ab0b1163dc10 100755
--- a/src/scripts/check_deps
+++ b/src/scripts/check_deps
@@ -28,16 +28,27 @@ class CheckDependencies(object):
self._verbose = verbose
# Insert some default directories into our library cache.
- # The /usr/lib/nss and /usr/lib/nspr directories are
- # required for understanding old-style Netscape plugins.
- self._ReadLibs([
- "%s/lib" % root,
- "%s/usr/local/lib" % root,
- "%s/usr/lib" % root,
- "%s/usr/lib/nss" % root,
- "%s/usr/lib/nspr" % root,
- "%s/opt/google/o3d/lib" % root
- ], self._libcache)
+ libdirs = [
+ "%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.
+ ld_so_conf = "%s/etc/ld.so.conf" % root
+ if os.path.exists(ld_so_conf):
+ f = file(ld_so_conf)
+ for line in f:
+ if line.startswith("/"):
+ path = root + line[:-1]
+ if os.path.exists(path):
+ libdirs.append(path)
+ f.close()
+
+ self._ReadLibs(libdirs, self._libcache)
def _ReadLibs(self, paths, libcache):
for path in paths:
@@ -65,7 +76,10 @@ class CheckDependencies(object):
m = _RPATH_RE.search(line)
if m:
for path in m.group(1).split(":"):
- rpaths.add(os.path.join(self._root, path[1:]))
+ if path.startswith("$ORIGIN"):
+ rpaths.add(path.replace("$ORIGIN", os.path.dirname(binary)))
+ else:
+ rpaths.add(os.path.join(self._root, path[1:]))
f.close()
return (deps, rpaths)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698