From patchwork Thu Sep 14 11:00:05 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: 112526 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp518315edb; Thu, 14 Sep 2017 04:01:31 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAWPzf7r18j44qFeq2Kk3+3SwjSFEZNVpgJau+XWYtSR/FVX+lSeFJR5CvCK4ocbKsYw0wA X-Received: by 10.237.37.14 with SMTP id v14mr28736254qtc.116.1505386891784; Thu, 14 Sep 2017 04:01:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505386891; cv=none; d=google.com; s=arc-20160816; b=dibXYI9FunuQoFO1qVHPgszx5bfr5LFbG4xrcOK7Ptg3+mwdCsRGLCEGoVsf023ET4 rgk5J+JMbYcvRGaqn+hhXhupdkN49Az0dxIc+LQeVZCuVA0qfoqwpmUvsOqRqujcbrNM YJs6tBl9xeEbXB5a9PugNfytEq4B9JtlHOpDvU975dUdQ3GHTdKRJ+XudXiqXUwvdrgm YwHMLjTiIIzA9ll6rpX6OP9OOpLQhBwRrZXF833BthirD5Sf/R5F3iI89LSMm1PhdDEc YbN80XtFJXzFu2m9sM/N6NJO4DO0///ux3K39ioMB1N2KbslnOGxqHuj6fudSSD0WGBs zu2w== 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=uQR/zYtjj5anjGig2dI4jdyCE9UUjaW3XkLUbEXN4/Y=; b=JpiHDWKA4aspV0xeWE5grp22OTLdwsyvyZrfndukyn6MhYARES5p2Sr/b9yDhsFcif ZJKnLDDXrMXOdH7QAY9sa2aRw9PPtdmVCkUweNmPmu8QKH8rWN7eDrjmle2SCi04GwUr ci6FAh0yXLHtO44rT478rR+huETT1Ez7UCrrY2+C6NYfFlXC6mpwFQEwCgkubY8cnUNK mWYlUeKhYIjGLDNuafAXCQyIjleppS7vKzIb6mi4s735HB55Fu1yP4kl3vVcMZ+CUskK BQCeE898czXMZvwgUrSRQm9//BVB+X2h+7HcFHO2bkoSWKwoS44Dll7gs/gxHCAYt/nN Nstg== 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 e43si2185607qtc.172.2017.09.14.04.01.31; Thu, 14 Sep 2017 04:01:31 -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 6A56160B4E; Thu, 14 Sep 2017 11:01:31 +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,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 6DCE5609C9; Thu, 14 Sep 2017 11:00:29 +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 D1B9B609DB; Thu, 14 Sep 2017 11:00:20 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id AD22B60813 for ; Thu, 14 Sep 2017 11:00:16 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward102p.mail.yandex.net (Yandex) with ESMTP id A7657430321F for ; Thu, 14 Sep 2017 14:00:15 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FFSSnfVMtd-0FPa5Luf; Thu, 14 Sep 2017 14:00:15 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id V9Xe4IstaW-0FO0qqIV; Thu, 14 Sep 2017 14:00:15 +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: Thu, 14 Sep 2017 14:00:05 +0300 Message-Id: <1505386807-2986-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505386807-2986-1-git-send-email-odpbot@yandex.ru> References: <1505386807-2986-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 175 Subject: [lng-odp] [PATCH v5 5/7] 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: 037b9d885bd9497de1ed06b5c7c1aa75d0cf22fc **/ .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