From: Leon Romanovsky <leonro@xxxxxxxxxxxx> Change of base image from trusty to xenial allows us to use more advanced version of GCC than before. Using this opportunity, clean not needed .travis.yml entries. Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx> --- PR: https://github.com/linux-rdma/rdma-core/pull/435 --- .travis.yml | 13 ++++++------- buildlib/travis-build | 8 ++++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index a90a78cc..e093566b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,16 +7,12 @@ addons: apt: sources: - ubuntu-toolchain-r-test - # Multiverse is not on by default and we need it to get sparse - - sourceline: "deb http://archive.ubuntu.com/ubuntu/ xenial multiverse" packages: - - build-essential - debhelper - dh-systemd - fakeroot - - gcc - - gcc-7 - - git + - gcc-8 + - git-core - libnl-3-dev - libnl-route-3-dev - libudev-dev @@ -33,7 +29,10 @@ addons: # 32 bit support packages - gcc-multilib - - lib32gcc-7-dev + # xenial craziness, need to give specific version of multilib, + # in addition to general multilib + - gcc-8-multilib + - lib32gcc-8-dev service: - docker diff --git a/buildlib/travis-build b/buildlib/travis-build index 7e0f2fba..503414cb 100755 --- a/buildlib/travis-build +++ b/buildlib/travis-build @@ -15,9 +15,9 @@ ninja # 32 bit build to check format strings/etc cd ../build32 -# travis's trusty is not configured in a way that enables all 32 bit +# travis is not configured in a way that enables all 32 bit # packages. We could fix this with some sudo stuff.. For now turn off libnl -CC=gcc-7 CFLAGS="-Werror -m32 -msse3" cmake -GNinja .. -DENABLE_RESOLVE_NEIGH=0 -DIOCTL_MODE=both +CC=gcc-8 CFLAGS="-Werror -m32 -msse3" cmake -GNinja .. -DENABLE_RESOLVE_NEIGH=0 -DIOCTL_MODE=both ninja # aarch64 build to check compilation on ARM 64bit platform @@ -46,7 +46,7 @@ CC=clang-7 CFLAGS=-Werror cmake -GNinja .. -DIOCTL_MODE=both ninja cp ../util/udma_barrier.h.old ../util/udma_barrier.h -# Finally run through gcc-7 64 bit through the debian packaging This gives a +# Finally run through gcc-8 64 bit through the debian packaging This gives a # good clue if patches are changing packaging related things, the RPM stuff # will have to be audited by hand. @@ -57,5 +57,5 @@ echo 'set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")' >> buildlib/RDMA_EnableCStd sed -i -e 's/-DCMAKE_BUILD_TYPE=Release//g' debian/rules sed -i -e 's/ninja \(.*\)-v/ninja \1/g' debian/rules -CC=gcc-7 debian/rules build +CC=gcc-8 debian/rules build fakeroot debian/rules binary -- 2.19.1
