From d771ffb942ffdd0e3435bad0dee115126dd7f962 Mon Sep 17 00:00:00 2001 From: Dmitry Safonov Date: Tue, 12 Apr 2016 19:10:40 +0300 Subject: [PATCH] Dockerfile: add libc6-dev-i386 & gcc-multilib Fixes the following error on travis-ci: CC arch/x86/syscalls/syscall32.o In file included from /usr/include/signal.h:28:0, from /home/travis/build/0x7f454c46/criu/criu/arch/x86/include/asm/types.h:5, from arch/x86/syscalls/syscall32.c:1: /usr/include/features.h:374:25: fatal error: sys/cdefs.h: No such file or directory # include ^ Signed-off-by: Dmitry Safonov Acked-by: Cyrill Gorcunov Signed-off-by: Pavel Emelyanov Signed-off-by: Andrei Vagin --- scripts/build/Dockerfile.x86_64.hdr | 4 ++++ scripts/travis/travis-tests | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/build/Dockerfile.x86_64.hdr b/scripts/build/Dockerfile.x86_64.hdr index 331b71343..2f136098c 100644 --- a/scripts/build/Dockerfile.x86_64.hdr +++ b/scripts/build/Dockerfile.x86_64.hdr @@ -1 +1,5 @@ FROM ubuntu:trusty + +RUN apt-get update -qq && apt-get install -qq \ + gcc-multilib \ + libc6-dev-i386 diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests index c8c519202..ac73981ad 100755 --- a/scripts/travis/travis-tests +++ b/scripts/travis/travis-tests @@ -3,7 +3,8 @@ set -x -e TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c0-dev libaio-dev libprotobuf-dev protobuf-compiler python-ipaddr libcap-dev - libnl-3-dev gdb bash python-protobuf libnet-dev util-linux" + libnl-3-dev gcc-multilib libc6-dev-i386 gdb bash python-protobuf + libnet-dev util-linux" travis_prep () { [ -n "$SKIP_TRAVIS_PREP" ] && return