48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
|
Index: gpsd-3.17/SConstruct
|
||
|
|
===================================================================
|
||
|
|
--- gpsd-3.17.orig/SConstruct
|
||
|
|
+++ gpsd-3.17/SConstruct
|
||
|
|
@@ -23,6 +23,13 @@
|
||
|
|
# * Out-of-directory builds: see http://www.scons.org/wiki/UsingBuildDir
|
||
|
|
# * Coveraging mode: gcc "-coverage" flag requires a hack
|
||
|
|
# for building the python bindings
|
||
|
|
+# * Python 3 compatibility in this recipe
|
||
|
|
+
|
||
|
|
+# Since SCons 3.0.0 forces print_function on us, it needs to be unconditional.
|
||
|
|
+# This is recognized to be a bug in SCons, but we need to live with it for now,
|
||
|
|
+# and we'll need this for eventual Python 3 compatibility, anyway.
|
||
|
|
+# Python requires this to precede any non-comment code.
|
||
|
|
+from __future__ import print_function
|
||
|
|
|
||
|
|
# Release identification begins here
|
||
|
|
gpsd_version = "3.17"
|
||
|
|
@@ -375,7 +382,7 @@ if env.GetOption("silent"):
|
||
|
|
|
||
|
|
def announce(msg):
|
||
|
|
if not env.GetOption("silent"):
|
||
|
|
- print msg
|
||
|
|
+ print(msg)
|
||
|
|
|
||
|
|
# DESTDIR environment variable means user prefix the installation root.
|
||
|
|
DESTDIR = os.environ.get('DESTDIR', '')
|
||
|
|
@@ -1546,8 +1553,8 @@ def substituter(target, source, env):
|
||
|
|
content = content.replace(s, t)
|
||
|
|
m = re.search("@[A-Z]+@", content)
|
||
|
|
if m and m.group(0) not in map(lambda x: x[0], substmap):
|
||
|
|
- print >>sys.stderr, "Unknown subst token %s in %s." \
|
||
|
|
- % (m.group(0), sfp.name)
|
||
|
|
+ print("Unknown subst token %s in %s." % (m.group(0), sfp.name),
|
||
|
|
+ file=sys.stderr)
|
||
|
|
tfp = open(str(target[0]), "w")
|
||
|
|
tfp.write(content)
|
||
|
|
tfp.close()
|
||
|
|
@@ -2190,7 +2197,7 @@ def validation_list(target, source, env)
|
||
|
|
if '-head' not in page:
|
||
|
|
fp = open(page)
|
||
|
|
if "Valid HTML" in fp.read():
|
||
|
|
- print os.path.join(website, os.path.basename(page))
|
||
|
|
+ print(os.path.join(website, os.path.basename(page)))
|
||
|
|
fp.close()
|
||
|
|
Utility("validation-list", [www], validation_list)
|
||
|
|
|