Update CI a bit more, add -fPIC if toolset is clang or gcc - may be n…

…eeded for others too, but not for CI.
jeking3 · Nov 7, 2018 · 3bf6643 · 3bf6643
1 parent 0fe596e
commit 3bf6643
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@
 
 #
 # Generic Travis CI build script for boostorg repositories
-# See: https://github.com/boostorg/boost-ci
+# See: https://github.com/jeking3/boost-ci
 #
 # Instructions for customizing this script for your library:
 # 
@@ -31,12 +31,12 @@ env:
   # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
   # to use the default for a given environment, comment it out; recommend you build debug and release however..
   # - B2_ADDRESS_MODEL=address-model=64,32
-    - B2_LINK=link=shared,static
+  # - B2_LINK=link=shared,static
   # - B2_THREADING=threading=multi,single
-    - B2_VARIANT=variant=release,debug
+    - B2_VARIANT=variant=release
 
 install:
-  - git clone https://github.com/boostorg/boost-ci.git boost-ci
+  - git clone https://github.com/jeking3/boost-ci.git boost-ci
   - cp -pr boost-ci/ci boost-ci/.codecov.yml .
   - source ci/travis/install.sh
 
@@ -95,32 +95,26 @@ jobs:
     - env:
       - COPY="all the environment settings from your job"
 
-  # Note since all jobs include 4 variants (link static/shared, variant debug/release)
-  # We only build one language level at a time.
   include:
     # libstdc++
-    - { os: "linux", env: [ "TOOLSET=gcc-4.4",   "CXXSTD=98"          ], addons: *gcc-44    }
-    - { os: "linux", env: [ "TOOLSET=gcc-4.6",   "CXXSTD=03"          ], addons: *gcc-46    }
-    - { os: "linux", env: [ "TOOLSET=gcc-4.8",   "CXXSTD=03"          ], addons: *gcc-48    }
-    - { os: "linux", env: [ "TOOLSET=gcc-5",     "CXXSTD=03"          ], addons: *gcc-5     }
-    - { os: "linux", env: [ "TOOLSET=gcc-6",     "CXXSTD=11"          ], addons: *gcc-6     }
-    - { os: "linux", env: [ "TOOLSET=gcc-7",     "CXXSTD=14"          ], addons: *gcc-7     }
-    - { os: "linux", env: [ "TOOLSET=gcc-8",     "CXXSTD=17"          ], addons: *gcc-8     }
-    - { os: "linux", env: [ "TOOLSET=gcc-8",     "CXXSTD=2a"          ], addons: *gcc-8     }
-    - { os: "linux", env: [ "TOOLSET=clang-3.4", "CXXSTD=03"          ], addons: *clang-34  }
-    - { os: "linux", env: [ "TOOLSET=clang-3.8", "CXXSTD=03"          ], addons: *clang-38  }
-    - { os: "linux", env: [ "TOOLSET=clang-4.0", "CXXSTD=11"          ], addons: *clang-4   }
-    - { os: "linux", env: [ "TOOLSET=clang-5.0", "CXXSTD=14"          ], addons: *clang-5   }
-    - { os: "linux", env: [ "TOOLSET=clang-6.0", "CXXSTD=17"          ], addons: *clang-6   }
-    - { os: "linux", env: [ "TOOLSET=clang-6.0", "CXXSTD=2a"          ], addons: *clang-6   }
+    - { os: "linux", env: [ "TOOLSET=gcc-4.4",   "CXXSTD=98,0x"          ], addons: *gcc-44    }
+    - { os: "linux", env: [ "TOOLSET=gcc-4.6",   "CXXSTD=03,0x"          ], addons: *gcc-46    }
+    - { os: "linux", env: [ "TOOLSET=gcc-4.8",   "CXXSTD=03,11"          ], addons: *gcc-48    }
+    - { os: "linux", env: [ "TOOLSET=gcc-5",     "CXXSTD=03,11"          ], addons: *gcc-5     }
+    - { os: "linux", env: [ "TOOLSET=gcc-6",     "CXXSTD=11,14"          ], addons: *gcc-6     }
+    - { os: "linux", env: [ "TOOLSET=gcc-7",     "CXXSTD=14,17"          ], addons: *gcc-7     }
+    - { os: "linux", env: [ "TOOLSET=gcc-8",     "CXXSTD=17,2a"          ], addons: *gcc-8     }
+    - { os: "linux", env: [ "TOOLSET=clang-3.4", "CXXSTD=03,11"          ], addons: *clang-34  }
+    - { os: "linux", env: [ "TOOLSET=clang-3.8", "CXXSTD=03,11"          ], addons: *clang-38  }
+    - { os: "linux", env: [ "TOOLSET=clang-4.0", "CXXSTD=11,14"          ], addons: *clang-4   }
+    - { os: "linux", env: [ "TOOLSET=clang-5.0", "CXXSTD=14,17"          ], addons: *clang-5   }
+    - { os: "linux", env: [ "TOOLSET=clang-6.0", "CXXSTD=17,2a"          ], addons: *clang-6   }
     # libc++
-    - { os: "linux", env: [ "TOOLSET=clang-6.0", "CXXSTD=03",
-                            "CXXFLAGS=-stdlib=libc++"                 ], addons: *clang-6   }
-    - { os: "linux", env: [ "TOOLSET=clang-6.0", "CXXSTD=17",
-                            "CXXFLAGS=-stdlib=libc++"                 ], addons: *clang-6   }
+    - { os: "linux", env: [ "TOOLSET=clang-6.0", "CXXSTD=03,17",
+                            "CXXFLAGS=-stdlib=libc++"                    ], addons: *clang-6   }
   # the rvm environment on osx is taking over basic commands like "cd" and breaking things!
   # - { os: "osx"  , env: [ "COMMENT=libc++",
-  #                         "TOOLSET=clang",     "CXXSTD=03,11,14"    ]                     }
+  #                         "TOOLSET=clang",     "CXXSTD=03,14"          ]                     }
 
     - os: linux
       env: 
@@ -145,7 +139,7 @@ jobs:
         - COMMENT=ubsan
         - B2_VARIANT=variant=debug
         - TOOLSET=gcc-8
-        - CXXSTD=03
+        - CXXSTD=03,17
         - DEFINES="define=BOOST_NO_STRESS_TEST=1"
         - CXXFLAGS="cxxflags=-fno-omit-frame-pointer cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined"
         - LINKFLAGS="linkflags=-fsanitize=undefined linkflags=-fno-sanitize-recover=undefined linkflags=-fuse-ld=gold"
@@ -156,7 +150,7 @@ jobs:
       env:
         - COMMENT=valgrind
         - TOOLSET=clang-6.0
-        - CXXSTD=03
+        - CXXSTD=03,17
         - DEFINES="define=BOOST_NO_STRESS_TEST=1"
         - B2_VARIANT=variant=debug
         - TESTFLAGS=testing.launcher=valgrind

diff --git a/Jamfile b/Jamfile
@@ -3,6 +3,15 @@
 #  Use, modification, and distribution are subject to the
 #  Boost Software License, Version 1.0. (See accompanying file
 #  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+
+import set ;
+local pic = set.add clang gcc ;
+
+project libs/serialization
+  : requirements
+    <toolset>$(pic):<cxxflags>-fPIC
+  ;
 
 # please order by name to ease maintenance
 build-project example ;

diff --git a/appveyor.yml b/appveyor.yml
@@ -61,12 +61,12 @@ environment:
     - FLAVOR: Visual Studio 2017 C++14 (Default)
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       TOOLSET: msvc-14.1
-      B2_ADDRESS_MODEL: address-model=64,32
+      B2_ADDRESS_MODEL: address-model=64
 
     - FLAVOR: Visual Studio 2015 C++14 (Default)
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-14.0
-      B2_ADDRESS_MODEL: address-model=64,32
+      B2_ADDRESS_MODEL: address-model=64
 
     - FLAVOR: Visual Studio 2010, 2012, 2013
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
@@ -76,7 +76,7 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       ADDPATH: C:\cygwin\bin;
       B2_ADDRESS_MODEL: address-model=32
-      CXXSTD: 03,11
+      CXXSTD: 03
       # https://github.com/boostorg/test/issues/144
       DEFINES: define=_POSIX_C_SOURCE=200112L
       THREADING: threadapi=pthread
@@ -86,7 +86,7 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       ADDPATH: C:\cygwin64\bin;
       B2_ADDRESS_MODEL: address-model=64
-      CXXSTD: 11,17
+      CXXSTD: 11
       # https://github.com/boostorg/test/issues/144
       DEFINES: define=_POSIX_C_SOURCE=200112L define=__USE_ISOC99
       THREADING: threadapi=pthread
@@ -96,14 +96,14 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       ARCH: i686
       B2_ADDRESS_MODEL: address-model=32
-      CXXSTD: 03,11
+      CXXSTD: 11
       SCRIPT: ci\appveyor\mingw.bat
 
     - FLAVOR: mingw64
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       ARCH: x86_64
       B2_ADDRESS_MODEL: address-model=64
-      CXXSTD: 11,17
+      CXXSTD: 17
       DEFINES: define=__USE_ISOC99
       SCRIPT: ci\appveyor\mingw.bat