Does this patch work for you?

cheers,
BMS
Index: SConstruct
===================================================================
--- SConstruct  (revision 11676)
+++ SConstruct  (working copy)
@@ -21,6 +21,8 @@
 # TODO Fix default include/lib paths, pass in from environment.
 # TODO Merge scons-unfamiliar syntactic sugar from YHC's sconsfiles.
 
+import relpath
+
 gnutoolwarning = """
 WARNING: The GNU %s was not detected on your system.
 Some combinations of linker or compiler flags, specific to building XORP,
@@ -29,7 +31,7 @@
 
 # The XRL tgt-gen and clnt-gen scripts use Python 2.3+'s optparse
 # class. However, os.path.relpath() requires Python 2.6.
-EnsurePythonVersion(2, 6)
+EnsurePythonVersion(2, 3)
 
 # SCons 0.98.4 is the earliest release that we have tested.  Earlier
 # ones may work.  If so, please submit a Trac issue so the check can
Index: relpath.py
===================================================================
--- relpath.py  (revision 0)
+++ relpath.py  (revision 0)
@@ -0,0 +1,21 @@
+#
+# Monkey patch for os.path to include relpath if python version is < 2.6.
+#
+# Obtained from:
+#  http://bitbucket.org/benoitc/couchdbkit/issue/15/python-25-compatibility
+#
+
+import os
+
+if not hasattr(os.path, "relpath"):
+    def relpath(longPath, basePath):
+        if not longPath.startswith(basePath):
+            raise RuntimeError("Unexpected arguments")
+        if longPath == basePath:
+            return "."
+        i = len(basePath)
+        if not basePath.endswith(os.path.sep):
+            i += len(os.path.sep)
+        return longPath[i:]
+
+    os.path.relpath = relpath
_______________________________________________
Xorp-hackers mailing list
[email protected]
http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-hackers

Reply via email to