From patchwork Thu Sep 14 11:00:03 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: 112530 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp521705edb; Thu, 14 Sep 2017 04:04:45 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD/IQTsYCU6RBYhi3BSk7BV5sMLCjiyRC2dPZllLS0hSWoGIZS1w1NskkFhXyYHi0gqdbcw X-Received: by 10.55.181.134 with SMTP id e128mr2149893qkf.62.1505387085825; Thu, 14 Sep 2017 04:04:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505387085; cv=none; d=google.com; s=arc-20160816; b=ZrVvugPfqpNUrTEnxWKFFyudxwwXyhsm5lDAX4ywUQ3f/YWMF1ZrLfEW3PI/jSzBlt 3MkUZGwBmzpxo+Rzo/rVBtQvvpZUPrvxHYh2Tld3oAjwuGChQbJ2diIy/oVu9ShupKoG ncpkyY36Ukomf2W3lyD8KUZcERiMwCA3QO4s0en7rjHg12XFYnA/jSoWyYNuHkKn7OHl sE3q5PYMyTjjlPvNZbz0Z8htuAepoz0zZH9kwRLtVhHCUBwjByhquNskNyTlGwNHulwt 7wPk2MDjJPmbyISf7uqpXj2UlPTNPSz4tFSUEEKQF0y3E8zKQaTsNF2rQROSVVOecrEU ubxQ== 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=qgqT0nMgbbG9oWMnpkC/2f7RgXD/RMsrMnXUJyeZxiM=; b=dE5g9k0Lk+f8vHhRHcvUQvgzOe8+W220LTebLgK36OQQcpyfbskaCJHsiORY8hulVv iIrwf6k2CTNEHSnfMMiQR2etEndObZNnyvedfh+e48eO4xpbvjvyiUxcA792KaCn3cJD SUvcFG1+mvaLUJow8w1c1ViYohap35B1QDDNRSO6GZFtDzZxM8pyudbul6Y/mDi9mXPv DytckHdol6x1L5dF+PHBiIg2lxAyaajbLM1A2KyFjjtkFNs9DSZjhcxZ6ZZutnQRuX38 DrpOea826ZQ5xdhy8Mmvs1HBTWHK8Qy5qYfMx+MFJV44fIbviyVYzPB1Oc7f1eyubS0F GmNw== 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 d64si16615528qkf.142.2017.09.14.04.04.45; Thu, 14 Sep 2017 04:04:45 -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 74BE562D05; Thu, 14 Sep 2017 11:04:45 +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 9679F60B4F; Thu, 14 Sep 2017 11:00:58 +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 B8DF7609B3; Thu, 14 Sep 2017 11:00:23 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id EA6D9609C9 for ; Thu, 14 Sep 2017 11:00:15 +0000 (UTC) Received: from mxback9g.mail.yandex.net (mxback9g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:170]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 5FF535A05E04 for ; Thu, 14 Sep 2017 14:00:14 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback9g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id DvVXuKUDa0-0Ecq3tTG; Thu, 14 Sep 2017 14:00:14 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id V9Xe4IstaW-0DOu6aA8; Thu, 14 Sep 2017 14:00:13 +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:03 +0300 Message-Id: <1505386807-2986-4-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 3/7] 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: 037b9d885bd9497de1ed06b5c7c1aa75d0cf22fc **/ .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