From 2de4e1d79f8b4f4dd014efe531055f7b7fec7829 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 28 Feb 2016 21:48:49 +0100 Subject: 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' --- doc/updating_waf.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/updating_waf.txt b/doc/updating_waf.txt index 622a0f6b6a..69c1225d63 100644 --- 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 -- cgit v1.2.3