Merge pull request #229 from buildout/225-dont_prefix_special_rpath_vars

Avoid prefixing buildout dir to 'special' rpath elements.

CHANGES.rst

@@ -22,6 +22,13 @@ Unreleased
   https://github.com/buildout/buildout/pull/222 .
   [lrowe]
 
+- Note: zc.recipe.egg has also been updated to 2.0.2 together with this
+  zc.buildout release. Fixed: In ``zc.recipe.egg#custom`` recipe's ``rpath``
+  support, don't assume path elements are buildout-relative if they start with
+  one of the "special" tokens (e.g., ``$ORIGIN``).  See:
+  https://github.com/buildout/buildout/issues/225.
+  [tseaver]
+
 - Bootstrap script now accepts ``--to-dir``. Setuptools is installed there. If
   already available there, it is reused. This can be used to bootstrap
   buildout without internet access. Similarly, a local ``ez_setup.py`` is used

zc.recipe.egg_/CHANGES.txt

 Change History
 **************
 
+2.0.2 (unreleased)
+==================
+
+- Fixed: In ``zc.recipe.egg#custom`` recipe's ``rpath`` support, don't
+  assume path elements are buildout-relative if they start with one of the
+  "special" tokens (e.g., ``$ORIGIN``).  See:
+  https://github.com/buildout/buildout/issues/225.
+  [tseaver]
+
 2.0.1 (2013-09-05)
 ==================
 

zc.recipe.egg_/setup.py

@@ -14,7 +14,7 @@
 """Setup for zc.recipe.egg package
 """
 
-version = '2.0.1'
+version = '2.0.2.dev0'
 
 import os
 from setuptools import setup, find_packages

zc.recipe.egg_/src/zc/recipe/egg/custom.py

@@ -130,7 +130,7 @@ class Develop(Base):
 
 def build_ext(buildout, options):
     result = {}
-    for be_option in ('include-dirs', 'library-dirs', 'rpath'):
+    for be_option in ('include-dirs', 'library-dirs'):
         value = options.get(be_option)
         if value is None:
             continue
@@ -145,6 +145,25 @@ def build_ext(buildout, options):
         result[be_option] = os.pathsep.join(value)
         options[be_option] = os.pathsep.join(value)
 
+    # rpath has special symbolic dirnames which must not be prefixed
+    # with the buildout dir.  See:
+    # http://man7.org/linux/man-pages/man8/ld.so.8.html
+    RPATH_SPECIAL = [
+        '$ORIGIN', '$LIB', '$PLATFORM', '${ORIGIN}', '${LIB}', '${PLATFORM}']
+    def _prefix_non_special(x):
+        x = x.strip()
+        for special in RPATH_SPECIAL:
+            if x.startswith(special):
+                return x
+        return os.path.join( buildout['buildout']['directory'], x)
+
+    value = options.get('rpath')
+    if value is not None:
+        values = [_prefix_non_special(v)
+                    for v in value.strip().split('\n') if v.strip()]
+        result['rpath'] = os.pathsep.join(values)
+        options['rpath'] = os.pathsep.join(values)
+
     swig = options.get('swig')
     if swig:
         options['swig'] = result['swig'] = os.path.join(