From patchwork Wed Sep 13 15:00:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 112478 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1244830qgf; Wed, 13 Sep 2017 11:19:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAE7h0CrKEslHkEEV0T953I1VDBJuj02jl6BPL3loAbcfV9vCX5c27eE2TqGd2NP1G5+Rc1 X-Received: by 10.237.62.200 with SMTP id o8mr27942173qtf.294.1505326797914; Wed, 13 Sep 2017 11:19:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505326797; cv=none; d=google.com; s=arc-20160816; b=w8S7cz0x6DmIr1YDgkm5NsA3uecTPlf6rEV/VnUscMR03b8Q0+k6fGC/BgPErsZEGj bt+QCxWlw68xRc/cobD3RwwxeKcjIYWecouWvW5JwLJ0A4OE487Ep+1ZkTRJE9AXVZ1G YpwciGkmKB9JlWZOBz/hfLtq013oWy70cLgIwbSfH9gsNsEz7cFSn7FAQJnezB6Wa/7T PD3o05+nBNimc63e/XXtPoYYRXzX2t4pTrjLE6BNeHaNKr7c8q4wOJAOgJIEU4EHtK1P 8q680+Nzbykr0kIiIcrOWMC8Mjgiae7kf7VEItgdRiWhRvnClZeohKn8N73VX/LKTJHz rUbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=nvKyAh/SIDg1FmFS9U442LwXFa+tLgTnuLzMZglR6oc=; b=YBD1C6nfXuGa87rlPGwuYILbfU+HpQq1eW9bZqBJi9Le7SxDBwmqKT8xPOmscxKKzR 12cuzk+TOsh4YWOMgvrg4xTtbiY0LyquKN2to/89eu/Bze+IMb6sh2TfROv5cADsFgor HfuK5I5qVz+DTkjADptL7z+hr8+eDZv6QjyTNMLVEqMslhJLaeAvRODo2mkia/P2p2sy Ro348b+to5/cINOwqwFkZRekcFXEhrv5WJmbHO4Pn8TZLLuGtEUg8el1vii8NFyTSOzS czomaIHf6UGcXwRDma+fnEgbEQ4zMYHeBasix/FlkHjlZV4rg63fF7iMf35Um8YEhtCc TKtA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id o4si3539043qkf.524.2017.09.13.11.19.57; Wed, 13 Sep 2017 11:19:57 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 97BE665E5E; Wed, 13 Sep 2017 18:19:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id CA2BE65C80; Wed, 13 Sep 2017 15:37:52 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8BB9F65C79; Wed, 13 Sep 2017 15:37:47 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 5AF6165C80 for ; Wed, 13 Sep 2017 15:00:18 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 162335105E6F for ; Wed, 13 Sep 2017 18:00:17 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YMAloOhwdq-0G1CFjv8; Wed, 13 Sep 2017 18:00:17 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ezxb9lWXfI-0GbaAcu9; Wed, 13 Sep 2017 18:00:16 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 13 Sep 2017 18:00:07 +0300 Message-Id: <1505314808-20772-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505314808-20772-1-git-send-email-odpbot@yandex.ru> References: <1505314808-20772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 175 Subject: [lng-odp] [PATCH v3 5/6] travis: enable cpp test during cross-compilation X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Install proper packages to enable cross-testing of linking C++ apps with ODP. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 175 (lumag:build-x86) ** https://github.com/Linaro/odp/pull/175 ** Patch: https://github.com/Linaro/odp/pull/175.patch ** Base sha: fb3f36cec108ce9c55241d9f0e66d4832a552b8a ** Merge commit sha: 6790672507c1c5394fa99f5fb5f87e6d508a693c **/ .travis.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3854378d..06983f8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,13 +85,20 @@ before_install: sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential ; if [ "$CROSS_ARCH" = "i386" ] ; then - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install gcc-multilib ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-multilib ; else - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install gcc-"$CROSS_GNU_TYPE" ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" ; fi ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH"; export PKG_CONFIG_PATH=/usr/lib/${CROSS_MULTIARCH}/pkgconfig:/usr/${CROSS_MULTIARCH}/lib/pkgconfig ; fi + - if [ "${CC#clang}" != "${CC}" ] ; + then + export CXX="${CC/clang/clang++}"; + elif [ "$CROSS_ARCH" = "i386" ] ; + then + export CXX="g++ -m32" ; + fi - if test ! -L /usr/lib/ccache/${CC%% *} ; then sudo ln -s -t /usr/lib/ccache/ `which ${CC%% *}` ; fi - ccache -s # Install cunit for the validation tests because distro version is too old and fails C99 compile @@ -187,7 +194,6 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full - --disable-test-cpp --enable-helper-linux - make -j $(nproc) - stage: test @@ -198,7 +204,6 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp/odp-install $CROSS --enable-debug=full - --disable-test-cpp --enable-helper-linux - make -j $(nproc) - stage: test @@ -209,7 +214,6 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full - --disable-test-cpp --enable-helper-linux - make -j $(nproc) - stage: test @@ -220,7 +224,6 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full - --disable-test-cpp --enable-helper-linux - make -j $(nproc) - stage: test @@ -231,7 +234,6 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full - --disable-test-cpp --enable-helper-linux - make -j $(nproc) - stage: test @@ -242,7 +244,6 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full - --disable-test-cpp --enable-helper-linux - make -j $(nproc) - stage: test @@ -253,7 +254,6 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full - --disable-test-cpp --enable-helper-linux - make -j $(nproc) - stage: test @@ -264,7 +264,6 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install $CROSS --enable-debug=full - --disable-test-cpp --enable-helper-linux - make -j $(nproc) - stage: test