Skip to content

Commit 5c701fc

Browse files
committed
build: update waf to version 2.0.27
Change-Id: I6a35992c1c9a5dd30b6e04a8993edfafb7f358fa
1 parent 9510c91 commit 5c701fc

File tree

8 files changed

+17
-27
lines changed

8 files changed

+17
-27
lines changed

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

+1-1
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

-3
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 <[email protected]>, 2008
63
# modified by Bjoern Michaelsen, 2008

.waf-tools/coverage.py

-2
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

+7-6
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_ASIO_NO_DEPRECATED', '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']}
@@ -246,6 +244,9 @@ def getDebugFlags(self, conf):
246244
elif self.getCompilerVersion(conf) >= (15, 0, 0):
247245
# https://releases.llvm.org/15.0.0/projects/libcxx/docs/UsingLibcxx.html#enabling-the-safe-libc-mode
248246
flags['DEFINES'] += ['_LIBCPP_ENABLE_ASSERTIONS=1']
247+
# Tell libc++ to avoid including transitive headers
248+
# https://libcxx.llvm.org/DesignDocs/HeaderRemovalPolicy.html
249+
flags['DEFINES'] += ['_LIBCPP_REMOVE_TRANSITIVE_INCLUDES=1']
249250
return flags
250251

251252
def getOptimizedFlags(self, conf):

.waf-tools/openssl.py

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#! /usr/bin/env python
2-
# encoding: utf-8
3-
41
"""
52
When using this tool, the wscript should look like:
63

.waf-tools/sanitizers.py

+1-1
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/sqlite3.py

-3
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

+8-8
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)