Bug#849328: Patch submitted upstream

[Jelmer Vernooij]

tags 849328 +patch
thanks

I have sent the attached patch upstream, which resolves this issue.

commit 372f1be5a78c447f7a827e87c2bf12ccf27cf5f0
Author: Jelmer Vernooij <jel...@jelmer.uk>
Date:   Sat Jan 7 19:28:39 2017 +0000

    Encode relative path to working tree in code paths when possible.
    
    This makes the build reproducible irregardless of the build path. Fixes: #1565

diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index 80a08c4bc..739d8037c 100644
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -9040,7 +9040,15 @@ class CodeObjectNode(ExprNode):
         func_name = code.get_py_string_const(
             func.name, identifier=True, is_str=False, unicode_value=func.name)
         # FIXME: better way to get the module file path at module init time? Encoding to use?
-        file_path = StringEncoding.bytes_literal(func.pos[0].get_filenametable_entry().encode('utf8'), 'utf8')
+        file_abspath = func.pos[0].get_filenametable_entry()
+        # Prefer relative paths to current directory (which is most likely the project root)
+        # over absolute paths.
+        workdir = os.getcwd() + os.sep
+        if file_abspath.startswith(workdir):
+            file_path = file_abspath[len(workdir):]
+        else:
+            file_path = file_abspath
+        file_path = StringEncoding.bytes_literal(file_path.encode('utf8'), 'utf8')
         file_path_const = code.get_py_string_const(file_path, identifier=False, is_str=True)
 
         flags = []

signature.asc
Description: PGP signature