From ea17399be6950863390fb7bf25b747b67afe0ce3 Mon Sep 17 00:00:00 2001
From: Thomas Nagy <tnagy@waf.io>
Date: Sun, 14 Jul 2019 10:44:58 +0200
Subject: [PATCH] waf-2.0.18

---
 ChangeLog         | 8 +++++++-
 waf-light         | 2 +-
 waflib/Context.py | 6 +++---
 wscript           | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c87c7d7b..a95e2b7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,14 @@ NEW IN WAF 2.0.18
 * Fix rpath processing so that it no longer breaks dependency chains
 * Fix fast_partial.py failures on configuration tests
 * Fix duplicate -fno-strict-aliasing flags in Python compilation flags detection
+* Fix annoying PIE errors in demos/asm/
+* Improve configuration tests cache accuracy #2251
+* Improve extras/fast_partial.py compatibility
+* Improve extras/doxygen.py outdir parameter settings #2255
 * Add a dependency scanner for assembly files (Gas/Yasm)
-* Add a QtTest example to demos/qt5/
+* Add executable arguments for configuration tests / execute=True
+* Add a QtTest example to demos/qt5/ #2241
+* Add a cross-compilation option to extras/objcopy.py #2247
 
 NEW IN WAF 2.0.17
 -----------------
diff --git a/waf-light b/waf-light
index 509e1169..713170e0 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="2.0.17"
+VERSION="2.0.18"
 REVISION="x"
 GIT="x"
 INSTALL="x"
diff --git a/waflib/Context.py b/waflib/Context.py
index d0759aad..e3305fa3 100644
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -11,13 +11,13 @@ from waflib import Utils, Errors, Logs
 import waflib.Node
 
 # the following 3 constants are updated on each new release (do not touch)
-HEXVERSION=0x2001100
+HEXVERSION=0x2001200
 """Constant updated on new releases"""
 
-WAFVERSION="2.0.17"
+WAFVERSION="2.0.18"
 """Constant updated on new releases"""
 
-WAFREVISION="6bc6cb599c702e985780e9f705b291b812123693"
+WAFREVISION="314689b8994259a84f0de0aaef74d7ce91f541ad"
 """Git revision when the waf version is updated"""
 
 ABI = 20
diff --git a/wscript b/wscript
index 76067794..75a6ec84 100644
--- a/wscript
+++ b/wscript
@@ -11,7 +11,7 @@ To add a tool that does not exist in the folder compat15, pass an absolute path:
 
 from __future__ import with_statement
 
-VERSION="2.0.17"
+VERSION="2.0.18"
 APPNAME='waf'
 REVISION=''