Add RPATH support. (Chad Austin)

5 files changed, 95 insertions, 0 deletions

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index dfeb3df..0c46747 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -5113,6 +5113,15 @@ are included on this command line.
 .IP RMICFLAGS
 General options passed to the Java RMI stub compiler.
 
+.IP RPATH
+A list of paths to search for shared libraries when running programs.
+Currently only used in the GNU linker.  Ignored on platforms and
+toolchains that don't support it.  Note that the paths added to RPATH
+are not transformed by
+.B scons
+in any way:  if you want an absolute
+path, you must make it absolute yourself.
+
 .IP SCANNERS
 A list of the available implicit dependency scanners. [CScan] by default.
 
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 0501093..49584a1 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -19,6 +19,11 @@ RELEASE 0.96 - XXX
   - Add a $QT_AUTOBUILD_MOC_SOURCES construction variable that controls
     whether moc-generated .cpp files get compiled.
 
+  From Chad Austin and Christoph Wiedemann:
+
+  - Add support for a $RPATH variable to supply a list of directories
+    to search for shared libraries when linking a program.
+
   From Charles Crain:
 
   - Restore the ability to do construction variable substitutions in all
diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
index bc121e6..f64d272 100644
--- a/src/engine/SCons/Platform/posix.py
+++ b/src/engine/SCons/Platform/posix.py
@@ -229,3 +229,6 @@ def generate(env):
     env['SPAWN']          = spawn
     env['SHELL']          = 'sh'
     env['ESCAPE']         = escape
+
+    # This platform supports RPATH specifications.
+    env['__RPATH'] = '$_RPATH'
diff --git a/src/engine/SCons/Tool/gnulink.py b/src/engine/SCons/Tool/gnulink.py
index 0e75304..b900202 100644
--- a/src/engine/SCons/Tool/gnulink.py
+++ b/src/engine/SCons/Tool/gnulink.py
@@ -45,6 +45,13 @@ def generate(env):
 
     if env['PLATFORM'] == 'hpux':
         env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared -fPIC')
+
+    # __RPATH is set to $_RPATH in the platform specification if that
+    # platform supports it.
+    env.Append(LINKFLAGS=['$__RPATH'])
+    env['RPATHPREFIX'] = '-Wl,--rpath='
+    env['RPATHSUFFIX'] = ''
+    env['_RPATH'] = '${_concat(RPATHPREFIX, RPATH, RPATHSUFFIX, __env__)}'
     
 def exists(env):
     return env.Detect(linkers)
diff --git a/test/RPATH.py b/test/RPATH.py
new file mode 100644
index 0000000..844e407
--- /dev/null
+++ b/test/RPATH.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import sys
+import TestSCons
+
+_exe = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+if sys.platform == 'cygwin':
+    test.no_result(1)
+elif sys.platform == 'win32':
+    test.no_result(1)
+
+foo = test.workpath('foo' + _exe)
+
+test.subdir('bar')
+
+test.write('SConstruct', """\
+SConscript('bar/SConscript')
+Program('foo', 'foo.c', LIBS='bar', LIBPATH='bar', RPATH='bar')
+""")
+
+test.write('foo.c', """\
+int main() {
+    void bar();
+    bar();
+    exit (0);
+}
+""")
+
+test.write(['bar', 'SConscript'], """\
+SharedLibrary('bar', 'bar.c')
+""")
+
+test.write(['bar', 'bar.c'], """\
+#include <stdio.h>
+void bar() {
+    puts("bar");
+}
+""")
+
+test.run(arguments='.')
+
+test.run(program=foo, chdir=test.workpath('.'), stdout='bar\n')
+
+test.pass_test()