build: require gcc >= 4.8.2 and boost >= 1.54.0
Change-Id: I6778f55f43e517a3d1d28387e953412a5292f063
Refs: #3599
diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index 9f15fcc..d57bfc3 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -126,16 +126,12 @@
def getGeneralFlags(self, conf):
flags = super(GccFlags, self).getGeneralFlags(conf)
version = tuple(int(i) for i in conf.env['CC_VERSION'])
- if version < (4, 6, 0):
+ if version < (4, 8, 2):
conf.fatal('The version of gcc you are using (%s) is too old.\n' %
'.'.join(conf.env['CC_VERSION']) +
- 'The minimum supported gcc version is 4.6.0.')
- elif version < (4, 7, 0):
- flags['CXXFLAGS'] += ['-std=c++0x']
+ 'The minimum supported gcc version is 4.8.2.')
else:
flags['CXXFLAGS'] += ['-std=c++11']
- if version < (4, 8, 0):
- flags['DEFINES'] += ['_GLIBCXX_USE_NANOSLEEP'] # Bug #2499
return flags
def getDebugFlags(self, conf):
diff --git a/README-dev.md b/README-dev.md
index 2c454ad..dd7ba54 100644
--- a/README-dev.md
+++ b/README-dev.md
@@ -57,7 +57,7 @@
# Run NFD RIB management tests
./build/unit-tests-rib
-However, [Boost.Test framework](http://www.boost.org/doc/libs/1_48_0/libs/test/doc/html/)
+However, [Boost.Test framework](http://www.boost.org/doc/libs/1_54_0/libs/test/doc/html/index.html)
is very flexible and allows a number of run-time customization of what tests should be run.
For example, it is possible to choose to run only a specific test suite, only a specific
test case within a suite, or specific test cases within specific test suites:
@@ -90,5 +90,5 @@
There are many more command line options available, information about
which can be obtained either from the command line using `--help`
-switch, or online on [Boost.Test library](http://www.boost.org/doc/libs/1_48_0/libs/test/doc/html/)
+switch, or online on [Boost.Test library](http://www.boost.org/doc/libs/1_54_0/libs/test/doc/html/index.html)
website.
diff --git a/daemon/main.cpp b/daemon/main.cpp
index a73dd09..2dd09e8 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+ * Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -40,7 +40,7 @@
#include <boost/program_options/parsers.hpp>
// boost::thread is used instead of std::thread to guarantee proper cleanup of thread local storage,
-// see http://www.boost.org/doc/libs/1_48_0/doc/html/thread/thread_local_storage.html
+// see http://www.boost.org/doc/libs/1_54_0/doc/html/thread/thread_local_storage.html
#include <boost/thread.hpp>
#include <atomic>
diff --git a/tests/test-case.t.cpp.sample b/tests/test-case.t.cpp.sample
index f264e6a..084b905 100644
--- a/tests/test-case.t.cpp.sample
+++ b/tests/test-case.t.cpp.sample
@@ -42,7 +42,7 @@
int i = 0;
// For reference of available Boost.Test macros, see
- // http://www.boost.org/doc/libs/1_48_0/libs/test/doc/html/utf/testing-tools/reference.html
+ // http://www.boost.org/doc/libs/1_54_0/libs/test/doc/html/utf/testing-tools/reference.html
BOOST_REQUIRE_NO_THROW(i = 1);
BOOST_REQUIRE_EQUAL(i, 1);
diff --git a/wscript b/wscript
index f51f65a..1f1904b 100644
--- a/wscript
+++ b/wscript
@@ -111,8 +111,8 @@
conf.env['WITH_OTHER_TESTS'] = 1
conf.check_boost(lib=boost_libs)
- if conf.env.BOOST_VERSION_NUMBER < 104800:
- Logs.error("Minimum required boost version is 1.48.0")
+ if conf.env.BOOST_VERSION_NUMBER < 105400:
+ Logs.error("Minimum required boost version is 1.54.0")
Logs.error("Please upgrade your distribution or install custom boost libraries" +
" (http://redmine.named-data.net/projects/nfd/wiki/Boost_FAQ)")
return