From d2fdd3637af4cce9f1ef32195f6548783403b777 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 16 Jan 2018 19:11:33 +0200 Subject: [PATCH 1/3] Add g++ 4.4, 4.6 to Travis --- .travis.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1b89980..df47660 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,26 @@ matrix: compiler: g++ env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11 + - os: linux + compiler: g++-4.4 + env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x + addons: + apt: + packages: + - g++-4.4 + sources: + - ubuntu-toolchain-r-test + + - os: linux + compiler: g++-4.6 + env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x + addons: + apt: + packages: + - g++-4.6 + sources: + - ubuntu-toolchain-r-test + - os: linux compiler: g++-4.7 env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11 @@ -200,7 +220,7 @@ install: script: - |- echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam - - ./b2 -j 3 libs/system/test toolset=$TOOLSET cxxstd=$CXXSTD + - ./b2 -j3 libs/system/test toolset=$TOOLSET cxxstd=$CXXSTD notifications: email: From 344df6c0a0cacd6530660199537e1d32086bcb18 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 17 Jan 2018 19:06:44 +0200 Subject: [PATCH 2/3] Add support for g++ 4.4 to test/Jamfile --- test/Jamfile.v2 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index e3ca329..8c59ddb 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -25,7 +25,11 @@ project { local result ; - if gcc in $(properties) || clang in $(properties) + if 4.4 in $(properties) + { + result = -std=c++98 ; + } + else if gcc in $(properties) || clang in $(properties) { result = -std=c++03 ; } @@ -41,7 +45,7 @@ project { local result ; - if 4.6 in $(properties) + if 4.4 in $(properties) || 4.6 in $(properties) { result = -std=c++0x ; } From b494f307b596f1696d98a94efddde98b3af1c825 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Jan 2018 00:01:17 +0200 Subject: [PATCH 3/3] Fix g++ 4.4 again --- test/Jamfile.v2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 8c59ddb..006a309 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -25,11 +25,11 @@ project { local result ; - if 4.4 in $(properties) + if gcc in $(properties) { - result = -std=c++98 ; + result = -std=c++98 ; # 4.4 has no 03 } - else if gcc in $(properties) || clang in $(properties) + else if clang in $(properties) { result = -std=c++03 ; } @@ -45,11 +45,11 @@ project { local result ; - if 4.4 in $(properties) || 4.6 in $(properties) + if gcc in $(properties) { - result = -std=c++0x ; + result = -std=c++0x ; # 4.6 has no 11 } - else if gcc in $(properties) || clang in $(properties) + else if clang in $(properties) { result = -std=c++11 ; }