From patchwork Wed Sep 13 14: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: 112448 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp983967qgf; Wed, 13 Sep 2017 07:02:35 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDL+Yu4gE5eLc+UdIsesUw7Iht5kJ6KTWd3+cGdwWRXQkYIMUEdISJnwK3Sam3yy2lDcCLK X-Received: by 10.55.72.81 with SMTP id v78mr24234170qka.333.1505311355223; Wed, 13 Sep 2017 07:02:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505311355; cv=none; d=google.com; s=arc-20160816; b=t6MZCFm/hVRdk8qzpFFTWHYyENAQd0ngi/EVjH+cPKegmKn4XkwHtNycxyIaHhYztJ iVWpdbcTpvzf4MGZ2nREwA03GSWWs/FgJ7vY0tn/VVeW+BmaLls8SwbnzXm9+Ni46sTv 1SevkEBqQwlOlRNJWTzW2rqCNB/xukSkx5XY8L8Mfo49yxZN4CxxoLE1vlHr1VFeB+St Y6g2tpGuZ7414xNkxbdgJA6ByeMrJUd6i33J8AFXSXa0W3DgBXMhF/yqihZE4Jgdvd2i cCFSWvfDYd/MQMaAmhkxwCppuWddpUmWJ0zr7HCKb+e7kBZkgyhcETvBPorkTkcb3RxY 0GLQ== 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=Mlr3ifg6XlygGvacnL4BPW5CNWDSPvBPEW6AZg6087w=; b=cKwC7hxzg/xk995GOoOz9FxzJlj0ElxnMkcICYqed60GBS9QCtVXe07CZ3L/YcCY2z Vq993BWaeuFTq2dB67ePZjwed3Ehh3R+Wus86jhB61+zisEhsP4K2+NT3hl5DyQHWBdF djzSIhZoJYWQLXxmg0BHu5+jvTA0+80eP1j03cb5CiEjdCiXBYzFjZcdRAbW8qhdnE/C ON2mcnZ0KOxvk1zMYp+/SUcxkPAV9eQYjzvCfldHX6M0mL3lSWVcdhoeTHHzRjY9CQHF KNsZ+Dm2dLnHkCs+AN5OSNgP5E1aBOh9arSuzODZboxNHCsH/Yf+81sX4AC6BOS8oVfm QeCg== 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 r65si14401396qkf.155.2017.09.13.07.02.34; Wed, 13 Sep 2017 07:02:35 -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 BFB606445F; Wed, 13 Sep 2017 14:02:34 +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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 2F0F360CDC; Wed, 13 Sep 2017 14:00:35 +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 75F8D60B14; Wed, 13 Sep 2017 14:00:26 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 705C560A41 for ; Wed, 13 Sep 2017 14:00:23 +0000 (UTC) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 9D7D52183BC4 for ; Wed, 13 Sep 2017 17:00:21 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback8j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ttY8PUxrg4-0L4Cg1BP; Wed, 13 Sep 2017 17:00:21 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id rO6ixn5FJb-0K2CrYT4; Wed, 13 Sep 2017 17:00:20 +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 17:00:05 +0300 Message-Id: <1505311206-19657-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505311206-19657-1-git-send-email-odpbot@yandex.ru> References: <1505311206-19657-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 175 Subject: [lng-odp] [PATCH v1 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: 0a03682a26c390a3e1567ae1767d6aca605f0ac7 **/ .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