diff options
| author | tschmelcher@google.com <tschmelcher@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 18:04:52 +0000 |
|---|---|---|
| committer | tschmelcher@google.com <tschmelcher@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 18:04:52 +0000 |
| commit | 151a96f357cdd774c0a890204563e57f83568db1 (patch) | |
| tree | ed009f82a54b20df362d0e98480aa46415993428 /o3d/plugin | |
| parent | cbb1e6b513943fcb284c00b69c8cfdfd3953228d (diff) | |
| download | chromium_src-151a96f357cdd774c0a890204563e57f83568db1.zip chromium_src-151a96f357cdd774c0a890204563e57f83568db1.tar.gz chromium_src-151a96f357cdd774c0a890204563e57f83568db1.tar.bz2 | |
Linux: fix a couple problems that Lintian reports for the .deb file:
- Eliminate useless call to ldconfig (see Debian bug #364436)
- Eliminate spurious rpath. We were setting the rpath equal to the build output directory for libs, which is wrong. The rpath is the _run-time_ library search path for the resulting binary, i.e. the one used by ld.so at load time. Setting it equal to the path to build output on the build machine is nonsense.
Also:
- Use new-found knowledge of rpath to eliminate the need to symlink into /usr/lib(32) by instead setting rpath to /opt/google/o3d/lib and putting our three dependent libs there.
Review URL: http://codereview.chromium.org/174369
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rw-r--r-- | o3d/plugin/build.scons | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/o3d/plugin/build.scons b/o3d/plugin/build.scons index 443822c..844afa0 100644 --- a/o3d/plugin/build.scons +++ b/o3d/plugin/build.scons @@ -245,6 +245,10 @@ if env.Bit('linux'): 'linux/main_linux.cc', 'linux/config.cc', ] + # This sets the rpath property on the generated shared object, which specifies + # additional paths that the run-time linker/loader will search for its + # dependent shared libraries. We install libGLEW, libCg, and libCgGL to here. + env.Append(RPATH=['/opt/google/o3d/lib']) # SCons doesn't really know about MacOSX bundles, so we need to override a |