patch waf - fixes clang/linux compilation

pkg-config --cflags for c++ libs includes -std=C++11
waf-1.6 has no concept to separate cflags/cxxflags in uselib for c files
clang error: invalid argument '-std=c++11' not allowed with 'C/ObjC'

diff --git a/doc/updating_waf.txt b/doc/updating_waf.txt
index 622a0f6b6a3ad2823d37a846b720b540e5c99b8c..69c1225d63290ee9036bf64faa9096c9a51876a8 100644 (file)
--- a/doc/updating_waf.txt
+++ b/doc/updating_waf.txt
@@ -1,7 +1,15 @@
-Download waf (http://code.google.com/p/waf/)
+Download waf (https://waf.io/)
+
 autowaf.py is present in the tools directory of the Ardour source code.
+a patch for C++11/clang can be found in tools/waflib.patch (needed for waf 1.8.19)
+
+Current waf is build as follows;
 
-From within the waf source tree, run:
+ARDOURSRC=`pwd`
+cd /tmp
+curl https://waf.io/waf-1.6.11.tar.bz2 | tar xj
+cd waf-1.6.11
 
-./waf-light -v --make-waf --tools=misc,doxygen,/path/to/autowaf.py --prelude=''
-cp ./waf /path/to/ardour/3.0/waf
+patch -p1 < $ARDOURSRC/tools/waflib.patch
+./waf-light -v --make-waf --tools=misc,doxygen,$ARDOURSRC/tools/autowaf.py --prelude=''
+cp ./waf $ARDOURSRC/waf

diff --git a/waf b/waf
index 880be147e819253e67b59213e005be33a7a03d0f..7363144d4b7822a7b0cf5fd67c68da262556dcb7 100755 (executable)
Binary files a/waf and b/waf differ