|
|
|
@ -1,20 +1,20 @@
|
|
|
|
|
diff --git a/bootstrap.py b/bootstrap.py
|
|
|
|
|
index 7ffd39a..aba9dd3 100755
|
|
|
|
|
index e526ff2..c887015 100755
|
|
|
|
|
--- a/bootstrap.py
|
|
|
|
|
+++ b/bootstrap.py
|
|
|
|
|
@@ -5,10 +5,10 @@
|
|
|
|
|
from __future__ import print_function
|
|
|
|
|
import os, sys, stat, hashlib, subprocess
|
|
|
|
|
|
|
|
|
|
-WAFRELEASE = "waf-1.8.4"
|
|
|
|
|
-WAFRELEASE = "waf-1.8.12"
|
|
|
|
|
+WAFRELEASE = "waf-1.7.16"
|
|
|
|
|
WAFURLS = ["http://ftp.waf.io/pub/release/" + WAFRELEASE,
|
|
|
|
|
WAFURLS = ["https://waf.io/" + WAFRELEASE,
|
|
|
|
|
"http://www.freehackers.org/~tnagy/release/" + WAFRELEASE]
|
|
|
|
|
-SHA256HASH = "f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8"
|
|
|
|
|
-SHA256HASH = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b"
|
|
|
|
|
+SHA256HASH = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61"
|
|
|
|
|
|
|
|
|
|
if os.path.exists("waf"):
|
|
|
|
|
wafver = subprocess.check_output(['./waf', '--version']).decode()
|
|
|
|
|
wafver = subprocess.check_output([sys.executable, './waf', '--version']).decode()
|
|
|
|
|
@@ -44,8 +44,6 @@ if SHA256HASH == hashlib.sha256(waf).hexdigest():
|
|
|
|
|
print("Checksum verified.")
|
|
|
|
|
else:
|
|
|
|
@ -25,7 +25,7 @@ index 7ffd39a..aba9dd3 100755
|
|
|
|
|
|
|
|
|
|
sys.exit(1)
|
|
|
|
|
diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py
|
|
|
|
|
index 0046cbf..eae705e 100644
|
|
|
|
|
index 3c83292..7401f01 100644
|
|
|
|
|
--- a/waftools/generators/headers.py
|
|
|
|
|
+++ b/waftools/generators/headers.py
|
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
@ -56,10 +56,10 @@ index fb5f130..5a9bf27 100644
|
|
|
|
|
cls = Task.classes['macplist']
|
|
|
|
|
class macplist(cls):
|
|
|
|
|
diff --git a/wscript b/wscript
|
|
|
|
|
index d3cc354..903fe31 100644
|
|
|
|
|
index d96f74b..9d0391a 100644
|
|
|
|
|
--- a/wscript
|
|
|
|
|
+++ b/wscript
|
|
|
|
|
@@ -839,7 +839,7 @@ def is_debug_build(ctx):
|
|
|
|
|
@@ -897,7 +897,7 @@ def is_debug_build(ctx):
|
|
|
|
|
|
|
|
|
|
def configure(ctx):
|
|
|
|
|
ctx.resetenv(ctx.options.variant)
|
|
|
|
|