<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d4a979bd0a5ca18d5d9104394eabe30cc94c7c44">https://github.com/macports/macports-ports/commit/d4a979bd0a5ca18d5d9104394eabe30cc94c7c44</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d4a979bd0a5 gmtl: Fixes for Python 3 compatibility
</span>d4a979bd0a5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d4a979bd0a5ca18d5d9104394eabe30cc94c7c44
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Mar 8 06:57:22 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> gmtl: Fixes for Python 3 compatibility
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67067
</span>---
math/gmtl/Portfile | 2 +
math/gmtl/files/SConstruct.patch | 246 +++++++++++++++++++++++++++++++++++++++
2 files changed, 248 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gmtl/Portfile b/math/gmtl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9918f2bce5c..bf9f398904d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gmtl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gmtl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +16,8 @@ checksums md5 1391af2c5ea050dda7735855ea5bb4c1 \
</span>
depends_build port:scons
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles SConstruct.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
build.cmd scons
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gmtl/files/SConstruct.patch b/math/gmtl/files/SConstruct.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..860d1aa92f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gmtl/files/SConstruct.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,246 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes for Python 3 compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SConstruct.orig 2009-11-21 15:31:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SConstruct 2023-03-08 06:47:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EnsureSConsVersion(0,96)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SConsignFile()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++from subprocess import Popen, PIPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import os, string, sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import re
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import distutils.sysconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,10 +17,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.path.append('tools/build')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from AutoDist import *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# True and False were not defined prior to Python 2.2.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if sys.version[:3] == '2.2' and sys.version[3] != '.':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- False = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- True = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_python = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost_version = '1.31'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,17 +45,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def GetPlatform():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Determines what platform this build is being run on."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if string.find(sys.platform, 'irix') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if sys.platform.find('irix') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 'irix'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif string.find(sys.platform, 'linux') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif sys.platform.find('linux') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 'linux'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif string.find(sys.platform, 'freebsd') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif sys.platform.find('freebsd') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 'freebsd'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif string.find(sys.platform, 'darwin') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif sys.platform.find('darwin') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif string.find(sys.platform, 'cygwin') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif sys.platform.find('cygwin') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 'cygwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif string.find(os.name, 'win32') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif os.name.find('win32') != -1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 'win32'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return sys.platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,8 +128,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX = os.environ.get("CXX", WhereIs('g++'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ver_re = re.compile(r'gcc version ((\d+)\.(\d+)\.(\d+))')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (gv_stdout, gv_stdin, gv_stderr) = os.popen3(CXX + ' -v')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ver_str = gv_stderr.read()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gv = Popen([CXX, '-v'], stderr=PIPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ver_str = gv.stderr.read().decode('utf-8')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ match_obj = ver_re.search(ver_str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -220,16 +217,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 9.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msvs_ver = ARGUMENTS["MSVS_VERSION"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if msvs_ver not in ("7.1", "9.0"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "Cannot build Python extensions using MSVS version %s" % \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- msvs_ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("Cannot build Python extensions using MSVS version %s" % \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ msvs_ver)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.exit(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_ver = sys.version[:3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if msvs_ver == "7.1" and python_ver not in ("2.4", "2.5"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "Python 2.4 or 2.5 must be used with Visual C++ 7.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("Python 2.4 or 2.5 must be used with Visual C++ 7.1")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.exit(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif msvs_ver == "9.0" and python_ver not in ("2.6"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "Python 2.6 must be used with Visual C++ 9.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("Python 2.6 must be used with Visual C++ 9.0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.exit(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env = Environment(MSVS_VERSION = msvs_ver)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,7 +236,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env = Environment(ENV = os.environ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "Using MSVS version:", env["MSVS"]["VERSION"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("Using MSVS version:", env["MSVS"]["VERSION"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler_major_ver = env["MSVS"]["VERSION"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We need exception handling support turned on for Boost.Python.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -283,7 +280,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif GetPlatform() == 'cygwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env = BuildCygwinEnvironment()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print 'Unsupported build environment: ' + GetPlatform(), "Trying default"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print('Unsupported build environment: ' + GetPlatform(), "Trying default")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env = Environment()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,7 +296,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exp = re.compile('^(\d+\.\d+(\.\d+)?)\D*$')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ match = exp.search(value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost_version = match.group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "Using Boost version", boost_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("Using Boost version", boost_version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert False, "Invalid Boost key"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -307,7 +304,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Validate the boost option settings"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global enable_python, optimize, compiler_major_ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ req_boost_version = 103100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "checking for %s [%s]...\n" % (key, value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("checking for %s [%s]...\n" % (key, value))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if "BoostPythonDir" == key:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version_dir = 'boost-' + re.sub(r'\.', '_', boost_version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,16 +312,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ potential_inc_paths = [pj('include', version_dir), "include"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for pth in potential_inc_paths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os.path.isdir(pj(value,pth)):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost_inc_dir = pj(value,pth)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print " trying boost include dir: [%s]"%boost_inc_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boost_inc_dir = pj(value,pth)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print(" trying boost include dir: [%s]"%boost_inc_dir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get the boost version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost_ver_filename = pj(boost_inc_dir, 'boost', 'version.hpp')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not os.path.isfile(boost_ver_filename):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.stdout.write("%s not found.\n" % boost_ver_filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- enable_python = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ enable_python = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ver_file = file(boost_ver_filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,7 +331,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.stdout.write("found version: %s\n" % ver_num)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ver_num < req_boost_version:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print " Boost version too old! Required version: %s" % req_boost_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print(" Boost version too old! Required version: %s" % req_boost_version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Exit()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -414,16 +411,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '%s%s.%s' % (shlib_prefix, n,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shlib_ext))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "Checking for '%s'" % boost_python_lib_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("Checking for '%s'" % boost_python_lib_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os.path.isfile(boost_python_lib_name):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "Using '%s'" % boost_python_lib_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("Using '%s'" % boost_python_lib_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bpl_libdir = l
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bpl_name = n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bpl_found = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not bpl_found:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "No Boost.Python library was found in", libdirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("No Boost.Python library was found in", libdirs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Exit()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -472,7 +469,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python = WhereIs('python')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not python:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_python = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print 'WARNING: Can\'t find python executable'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print('WARNING: Can\'t find python executable')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_cmd = python + ' -c \'import sys; print sys.prefix; print sys.version[:3]\''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -493,7 +490,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Version must match
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if float(py_ver) < required_version:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print 'WARNING: Python version ' + py_ver + ' != ' + str(required_version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print('WARNING: Python version ' + py_ver + ' != ' + str(required_version))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_python = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build up the env information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -567,7 +564,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my_file = env.SubstBuilder('file.out','file.in', submap=submap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- env.AddPostAction (my_file, Chmod('$TARGET', 0644))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env.AddPostAction (my_file, Chmod('$TARGET', 0o644))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Depends(my_file, 'version.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ targets = map(lambda x: str(x), target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -587,7 +584,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Write out the target file with the new contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ open(targets[i], 'w').write(contents)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os.chmod(targets[i], 0755)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.chmod(targets[i], 0o755)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def generate_builder_str(target, source, env):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builderStr = "generating: ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -606,7 +603,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Figure out what version of GMTL we're building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GMTL_VERSION = GetGMTLVersion()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-print 'Building GMTL Version: %i.%i.%i' % GMTL_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++print('Building GMTL Version: %i.%i.%i' % GMTL_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help_text = "\n---- GMTL Build System ----\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -617,7 +614,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Prefix(PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Export('PREFIX')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Export('optimize')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-print "Install prefix: ", Prefix()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++print("Install prefix: ", Prefix())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baseEnv = BuildPlatformEnv()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baseEnv["BUILDERS"]["SubstBuilder"] = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -659,7 +656,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Export('installed_targets')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not has_help_flag:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "Preparing build settings...\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("Preparing build settings...\n")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create the GMTL package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg = Package('gmtl', '%i.%i.%i' % GMTL_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -711,7 +708,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base_inst_paths['include'] = pj('${fp_file_cwd}' ,'..' ,'..', 'include',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "using prefix:", base_inst_paths['base']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("using prefix:", base_inst_paths['base'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for h in gmtl_headers:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installed_targets += baseEnv.InstallAs(pj(PREFIX, include_dir, h), h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -758,7 +755,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fpc_filename = "-".join(name_parts) + ".fpc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gmtl_fpc = env.SubstBuilder(pj(base_inst_paths['flagpoll'], fpc_filename),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'gmtl.fpc.in', submap = submap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- env.AddPostAction(gmtl_fpc, Chmod('$TARGET', 0644))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env.AddPostAction(gmtl_fpc, Chmod('$TARGET', 0o644))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Depends(gmtl_fpc, 'gmtl/Version.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installed_targets += env.Install(base_inst_paths['bin'], 'gmtl-config')
</span></pre><pre style='margin:0'>
</pre>