From patchwork Thu Sep 14 20:59:53 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: 112646 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp1037663edb; Thu, 14 Sep 2017 14:02:24 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCKceLofj8dfuDMtW/ZdRZlE3trTgk7tU4jLWa+YOaE+o1RZagRNroNZSxgG6mNf/A0ejwE X-Received: by 10.200.24.187 with SMTP id s56mr16254787qtj.64.1505422944786; Thu, 14 Sep 2017 14:02:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505422944; cv=none; d=google.com; s=arc-20160816; b=k5Qi5o/Y0GrfH58AsJe2u8xvfVKAT7Oy++1/MfDRN/hUQKsdw0XBLeY+mSZzapVRWH n+034VpuMEtmfemsfFLABbYPb51qWyGBrRVS+eBcVQ+pkyxCfF3xTrsa3aS/b3RZETph JIa9MMXOvaAG5uwMqA0cy4WhEqSeP9wujxweVD3R0ea1KX5ldF4/SS49GSdGvL/4/XnP 04oyQE/yM+liRpjioRq8mzAHHNuUczxU6O2hGChBxZDIDi0XsYeNr7GN3cV33CW9414b l7aQ077l+1LQZCI7/aFBxpzpOjIbEfO4QhXB37rQaEW8gPcbOnHNJA/TZAvxAqZrF//T XbwA== 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=hKbgRC5MPBTrCzEb7oYNuIYm87ljOYMM/AKYcfzYXlM=; b=RLiVcF/G2x9YB08GBMFA/UFn56SNleJ92w9AAETDxy7QfgoMLg500kYPazNmC8qxLW 60TEgF8gPGtqjkyYg0PJyb+Gnwm7MdtXIV3ubCqYLmnSOJeQzovJEzmbamStlPMwKcWq ggPITGGNV32mIVy6XS22ZE7BckwzTF24fqBIAWZk1N8HsuRHql4NjIBWsL4SgwA6v7jU Fe4D0I02HRn1/TSIRY3/VpC1UHS2cKiCLSHizteNtGJxsuIwUsZ6KBmb8gi7aOh8+X4p R8zus3XysjXRqf/YPXGuP2UtNS3NGMeVzff/dPCh+bH/87AIinG5Iw53vcJVZq7YNrwz 0o8Q== 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 28si15021434qtv.153.2017.09.14.14.02.24; Thu, 14 Sep 2017 14:02:24 -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 5D96060BE3; Thu, 14 Sep 2017 21:02:24 +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 B593360961; Thu, 14 Sep 2017 21:00:30 +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 DE336608ED; Thu, 14 Sep 2017 21:00:21 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 950CE608E5 for ; Thu, 14 Sep 2017 21:00:19 +0000 (UTC) Received: from mxback3g.mail.yandex.net (mxback3g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:164]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 474B91805B6B for ; Fri, 15 Sep 2017 00:00:17 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback3g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id jYGAHMFZsn-0HjWUMUX; Fri, 15 Sep 2017 00:00:17 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wNwc7KZcGv-0GmK92ob; Fri, 15 Sep 2017 00: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: Thu, 14 Sep 2017 23:59:53 +0300 Message-Id: <1505422809-5632-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505422809-5632-1-git-send-email-odpbot@yandex.ru> References: <1505422809-5632-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 179 Subject: [lng-odp] [PATCH API-NEXT v1 3/19] travis: don't use cross-pkg-config 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 Cross-pkg-config rewrites PKG_CONFIG_PATH to static value. Simulate it, but allow further script to expand PKG_CONFIG_PATH value. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Maxim Uvarov --- /** Email created from pull request 179 (muvarov:api-next) ** https://github.com/Linaro/odp/pull/179 ** Patch: https://github.com/Linaro/odp/pull/179.patch ** Base sha: 6b6253c30f88c80bf632436ff06c1b000860a2f1 ** Merge commit sha: ada61f5ba5f940d03a95893940c21028d4c75d19 **/ .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1ca4b5afa..b6e98184f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,8 +82,15 @@ before_install: sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty main" ; sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty-updates main" ; sudo -E apt-get -y update || true ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential gcc-"$CROSS_GNU_TYPE" pkg-config-"$CROSS_GNU_TYPE" ; + 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 ; + else + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install gcc-"$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" ; + export PKG_CONFIG_PATH=/usr/lib/${CROSS_MULTIARCH}/pkgconfig:/usr/${CROSS_MULTIARCH}/lib/pkgconfig ; fi - if test ! -L /usr/lib/ccache/${CC%% *} ; then sudo ln -s -t /usr/lib/ccache/ `which ${CC%% *}` ; fi - ccache -s