This is an automated email from the git hooks/post-receive script.
aboll-guest pushed a commit to branch master
in repository libclc.
commit 3078dd1f56d1b08090fc5a6391ad7531035018b6
Author: Jan Vesely <jan.vesely at rutgers.edu>
Date: Wed Aug 2 15:00:59 2017 +0000
configure.py: Make python3 friendly
mostly prints and exceptions.
Few behavioral changes are documented in the text
Generated Makefile is identical between python2 and python3
Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
Reviewed-by: Aaron Watry <awatry at gmail.com>
git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@309820 91177308-0d34-0410-b5e6-96231b3b80d8
---
build/metabuild.py | 2 +-
configure.py | 23 ++++++++++++++++++-----
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/build/metabuild.py b/build/metabuild.py
index 4ab5db5..b2d5a6e 100644
--- a/build/metabuild.py
+++ b/build/metabuild.py
@@ -97,4 +97,4 @@ def from_name(name):
return Make()
if name == 'ninja':
return Ninja()
- raise LookupError, 'unknown generator: %s; supported generators are make and ninja' % name
+ raise LookupError('unknown generator: %s; supported generators are make and ninja' % name)
diff --git a/configure.py b/configure.py
index f26f535..8e7017d 100755
--- a/configure.py
+++ b/configure.py
@@ -1,4 +1,11 @@
#!/usr/bin/python
+from __future__ import print_function
+
+# We only need this for int() cast, which works by default in python 2
+try:
+ from builtins import int
+except:
+ pass
def c_compiler_rule(b, name, description, compiler, flags):
command = "%s -MMD -MF $out.d %s -c -o $out $in" % (compiler, flags)
@@ -58,19 +65,21 @@ if not pkgconfigdir:
def llvm_config(args):
try:
- proc = Popen([llvm_config_exe] + args, stdout=PIPE)
+ # Universal newlines translate different newline formats to '\n'
+ # it also force the input to be string instead of bytes in python 3
+ proc = Popen([llvm_config_exe] + args, stdout=PIPE, universal_newlines=True)
return proc.communicate()[0].rstrip().replace('\n', ' ')
except OSError:
- print "Error executing llvm-config."
- print "Please ensure that llvm-config is in your $PATH, or use --with-llvm-config."
+ print("Error executing llvm-config.")
+ print("Please ensure that llvm-config is in your $PATH, or use --with-llvm-config.")
sys.exit(1)
-llvm_version = string.split(string.replace(llvm_config(['--version']), 'svn', ''), '.')
+llvm_version = llvm_config(['--version']).replace('svn', '').split('.')
llvm_int_version = int(llvm_version[0]) * 100 + int(llvm_version[1]) * 10
llvm_string_version = 'LLVM' + llvm_version[0] + '.' + llvm_version[1]
if llvm_int_version < 400:
- print "libclc requires LLVM >= 4.0"
+ print("libclc requires LLVM >= 4.0")
sys.exit(1)
llvm_system_libs = llvm_config(['--system-libs'])
@@ -180,6 +189,10 @@ for target in targets:
libdirs = filter(lambda d: os.path.isfile(os.path.join(d, 'SOURCES')),
[os.path.join(srcdir, subdir, 'lib') for subdir in subdirs])
+ # The above are iterables in python3 but we might use them multiple times
+ # if more then one device is supported.
+ incdirs = list(incdirs)
+ libdirs = list(libdirs)
clang_cl_includes = ' '.join(["-I%s" % incdir for incdir in incdirs])
for device in available_targets[target]['devices']:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/libclc.git