Skip to content

Commit 5ca40bb

Browse files
committed
build: update waf to version 2.0.27
Change-Id: I266ac34666eab05dd9c9108690ed1986dcdb0480
1 parent 16479f3 commit 5ca40bb

File tree

9 files changed

+22
-36
lines changed

9 files changed

+22
-36
lines changed

.jenkins.d/01-ndn-cxx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ sudo rm -f /usr/local/lib{,64}/pkgconfig/libndn-cxx.pc
3535

3636
pushd ndn-cxx >/dev/null
3737

38-
./waf --color=yes configure --without-osx-keychain
38+
./waf --color=yes configure
3939
./waf --color=yes build
4040
sudo ./waf --color=yes install
4141

.waf-tools/boost.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#!/usr/bin/env python
2-
# encoding: utf-8
3-
#
41
# partially based on boost.py written by Gernot Vormayr
52
# written by Ruediger Sonderfeld <ruediger@c-plusplus.de>, 2008
63
# modified by Bjoern Michaelsen, 2008

.waf-tools/coverage.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
2-
31
from waflib import TaskGen
42

53
def options(opt):

.waf-tools/default-compiler-flags.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
2-
31
import platform
42
from waflib import Configure, Logs, Utils
53

@@ -128,16 +126,16 @@ def getCompilerVersion(self, conf):
128126

129127
def getGeneralFlags(self, conf):
130128
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are always needed"""
129+
return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': []}
130+
131+
def getDebugFlags(self, conf):
132+
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are needed only in debug mode"""
131133
return {
132134
'CXXFLAGS': [],
133135
'LINKFLAGS': [],
134136
'DEFINES': ['BOOST_FILESYSTEM_NO_DEPRECATED'],
135137
}
136138

137-
def getDebugFlags(self, conf):
138-
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are needed only in debug mode"""
139-
return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': []}
140-
141139
def getOptimizedFlags(self, conf):
142140
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are needed only in optimized mode"""
143141
return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': ['NDEBUG']}
@@ -245,6 +243,9 @@ def getDebugFlags(self, conf):
245243
elif self.getCompilerVersion(conf) >= (15, 0, 0):
246244
# https://releases.llvm.org/15.0.0/projects/libcxx/docs/UsingLibcxx.html#enabling-the-safe-libc-mode
247245
flags['DEFINES'] += ['_LIBCPP_ENABLE_ASSERTIONS=1']
246+
# Tell libc++ to avoid including transitive headers
247+
# https://libcxx.llvm.org/DesignDocs/HeaderRemovalPolicy.html
248+
flags['DEFINES'] += ['_LIBCPP_REMOVE_TRANSITIVE_INCLUDES=1']
248249
return flags
249250

250251
def getOptimizedFlags(self, conf):

.waf-tools/doxygen.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#! /usr/bin/env python
2-
# encoding: UTF-8
31
# Thomas Nagy 2008-2010 (ita)
42

53
"""
6-
74
Doxygen support
85
96
Variables passed to bld():
@@ -27,9 +24,8 @@ def doxygen(bld):
2724
bld(features="doxygen", doxyfile='Doxyfile', ...)
2825
"""
2926

30-
from fnmatch import fnmatchcase
31-
import os, os.path, re, stat
32-
from waflib import Task, Utils, Node, Logs, Errors, Build
27+
import os, os.path, re
28+
from waflib import Task, Utils, Node
3329
from waflib.TaskGen import feature
3430

3531
DOXY_STR = '"${DOXYGEN}" - '
@@ -207,8 +203,8 @@ def configure(conf):
207203
conf.find_program('doxygen', var='DOXYGEN', mandatory=False)
208204
conf.find_program('tar', var='TAR', mandatory=False)
209205

210-
# doxygen docs
206+
# doxygen command
211207
from waflib.Build import BuildContext
212208
class doxy(BuildContext):
213-
cmd = "doxygen"
214-
fun = "doxygen"
209+
cmd = 'doxygen'
210+
fun = 'doxygen'

.waf-tools/sanitizers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
1+
# Davide Pesavento (LIP6), 2016
22

33
def options(opt):
44
opt.add_option('--with-sanitizer', action='store', default='', dest='sanitizers',

.waf-tools/sphinx_build.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#!/usr/bin/env python
2-
# encoding: utf-8
3-
41
# inspired by code by Hans-Martin von Gaudecker, 2012
52

63
import os

.waf-tools/sqlite3.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#! /usr/bin/env python
2-
# encoding: utf-8
3-
41
from waflib.Configure import conf
52

63
def options(opt):

waf

Lines changed: 8 additions & 8 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)