From patchwork Wed Sep 13 16:00:04 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: 112482 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1251158qgf; Wed, 13 Sep 2017 11:26:42 -0700 (PDT) X-Google-Smtp-Source: AOwi7QASsPGR0qoDYbf1Ps3yrFj/yKhCQPLrTBv9jytm+G28ts4/138guG5PwOhll80CRpKpxmMe X-Received: by 10.55.121.194 with SMTP id u185mr27234424qkc.101.1505327201938; Wed, 13 Sep 2017 11:26:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505327201; cv=none; d=google.com; s=arc-20160816; b=FcJrCzkhQcCSSJ5Qx7Lwr2hK497kgqAnv1ZypJw/VnMquizPoHme4un5e2A8ss/TEj Evd8SaJ/YzT37wh54LXzMdKewtFPXVqQF2zooy5kfkgLeXmozVtuYDgeKwstvV3TSdJd 1dimFqnVgIAXarhlntWjzKoMMQFnV9rkbAxU1j543Ea9TJOnMz9ZLJz7bWLuBs5xBh+x sKRCQNn74ISL3QVRClVo9UjauxLrvdAhFr3enrTyeH3arBP3tLbL/fQyuDAHQmubQfJ3 dhU56Mk5yYALU+XcIDzUb/WFD74mZfe7n4vfByiXiLbfLREdRZUZ7mejrLWws3nMR28y Q83A== 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=6tZCDqYME3ZZoGHHT6N5PifjGMmsJX4eOV+vzNt9N0U=; b=E+kmLSm1owDvQSs4U8C/zBowlPUMvyZYfReiWq+3dev0lKmq/q1kCkA8ZGCuT0TsWq KWjDEkCEv3QDzthJtYJhUPOKVKnSOh4TDyewnvw2HsR8qM19TqEEgs4NBFIf0abZOEVj 1E3SZkOtuCdKDrSurCN7KygDyClnzW9V4n8ZDlty6h+Smne8qHAk2rjS5hVd1SkowmXD MNKyZACRKNJlNImJ6wnOYaoJ/UtPrcqXFO4wJU83pZg0d0Ka2U4zAcJU5YIII3iEHfEu HFT/HXdAG6UoxTb4qz/Wv9wsmq40NpQrA6J4TBIs6ljPOtuFBBcSBSWETz3pChKIBzGA 7eFg== 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 t6si5098583qkt.210.2017.09.13.11.26.41; Wed, 13 Sep 2017 11:26:41 -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 989E165BC8; Wed, 13 Sep 2017 18:26:41 +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 8065665F3D; Wed, 13 Sep 2017 17:56:16 +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 91DF465F34; Wed, 13 Sep 2017 17:55:46 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id E129365D29 for ; Wed, 13 Sep 2017 16:00:16 +0000 (UTC) Received: from mxback12j.mail.yandex.net (mxback12j.mail.yandex.net [IPv6:2a02:6b8:0:1619::87]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 78146185DC3 for ; Wed, 13 Sep 2017 19:00:15 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback12j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 0131JGjrBc-0FSWCLiA; Wed, 13 Sep 2017 19:00:15 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id cDi0ojkXeT-0EK4BhUW; Wed, 13 Sep 2017 19:00:14 +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 19:00:04 +0300 Message-Id: <1505318407-21381-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505318407-21381-1-git-send-email-odpbot@yandex.ru> References: <1505318407-21381-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 175 Subject: [lng-odp] [PATCH v4 3/6] 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 --- /** 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: 053d08aa14dd4077b17b983bac6b9930801fbcba **/ .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1ca4b5af..b6e98184 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