Skip to content

Commit

Permalink
build: update waf to version 2.0.27
Browse files Browse the repository at this point in the history
Change-Id: I6a35992c1c9a5dd30b6e04a8993edfafb7f358fa
  • Loading branch information
Pesa committed Mar 13, 2024
1 parent 9510c91 commit 5c701fc
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .jenkins.d/01-ndn-cxx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ sudo rm -f /usr/local/lib{,64}/pkgconfig/libndn-cxx.pc

pushd ndn-cxx >/dev/null

./waf --color=yes configure --without-osx-keychain
./waf --color=yes configure
./waf --color=yes build
sudo ./waf --color=yes install

Expand Down
3 changes: 0 additions & 3 deletions .waf-tools/boost.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#!/usr/bin/env python
# encoding: utf-8
#
# partially based on boost.py written by Gernot Vormayr
# written by Ruediger Sonderfeld <ruediger@c-plusplus.de>, 2008
# modified by Bjoern Michaelsen, 2008
Expand Down
2 changes: 0 additions & 2 deletions .waf-tools/coverage.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

from waflib import TaskGen

def options(opt):
Expand Down
13 changes: 7 additions & 6 deletions .waf-tools/default-compiler-flags.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

import platform
from waflib import Configure, Logs, Utils

Expand Down Expand Up @@ -128,16 +126,16 @@ def getCompilerVersion(self, conf):

def getGeneralFlags(self, conf):
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are always needed"""
return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': []}

def getDebugFlags(self, conf):
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are needed only in debug mode"""
return {
'CXXFLAGS': [],
'LINKFLAGS': [],
'DEFINES': ['BOOST_ASIO_NO_DEPRECATED', 'BOOST_FILESYSTEM_NO_DEPRECATED'],
}

def getDebugFlags(self, conf):
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are needed only in debug mode"""
return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': []}

def getOptimizedFlags(self, conf):
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are needed only in optimized mode"""
return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': ['NDEBUG']}
Expand Down Expand Up @@ -246,6 +244,9 @@ def getDebugFlags(self, conf):
elif self.getCompilerVersion(conf) >= (15, 0, 0):
# https://releases.llvm.org/15.0.0/projects/libcxx/docs/UsingLibcxx.html#enabling-the-safe-libc-mode
flags['DEFINES'] += ['_LIBCPP_ENABLE_ASSERTIONS=1']
# Tell libc++ to avoid including transitive headers
# https://libcxx.llvm.org/DesignDocs/HeaderRemovalPolicy.html
flags['DEFINES'] += ['_LIBCPP_REMOVE_TRANSITIVE_INCLUDES=1']
return flags

def getOptimizedFlags(self, conf):
Expand Down
3 changes: 0 additions & 3 deletions .waf-tools/openssl.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#! /usr/bin/env python
# encoding: utf-8

"""
When using this tool, the wscript should look like:
Expand Down
2 changes: 1 addition & 1 deletion .waf-tools/sanitizers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
# Davide Pesavento (LIP6), 2016

def options(opt):
opt.add_option('--with-sanitizer', action='store', default='', dest='sanitizers',
Expand Down
3 changes: 0 additions & 3 deletions .waf-tools/sqlite3.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#! /usr/bin/env python
# encoding: utf-8

from waflib.Configure import conf

def options(opt):
Expand Down
16 changes: 8 additions & 8 deletions waf

Large diffs are not rendered by default.

0 comments on commit 5c701fc

Please sign in to comment.