From patchwork Wed Sep 13 15: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: 112476 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1243562qgf; Wed, 13 Sep 2017 11:18:43 -0700 (PDT) X-Google-Smtp-Source: AOwi7QChc2ytOQtyf4JthXx0nwrAFm1ZpVLSobyMd5D/t45fAYaqSpxLKQfTS0DSx+4Ml0KjQauJ X-Received: by 10.55.104.131 with SMTP id d125mr23209863qkc.37.1505326723597; Wed, 13 Sep 2017 11:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505326723; cv=none; d=google.com; s=arc-20160816; b=WB3SFMsfFuexYZeNJvVaZYFD/dkY4LrCVlQGwNO9XdaNwGkBYf51wuJswv5US5071B ZXEEgfw14ym6tIkgZ3niw9Znq1rWYzo//nXF+rGH9wu63d6MjzgiPhw/1dqNsHZax6YS o7bVmzjcxi94SKNgAMmFcGQK/rto6ZJGQcPys+t2E7TZ/NQHAdT0UnVD1uAb/FUUSoXf 9+eLs3jrsF7MVTzFO7y9YN8hqZ61WKBeWLnBGwxxBkF4J0bGCJjW3936UzghRgmJlSCI IzOH5rQlZwNzjQbMO5bQ09G5jo98mOq+QsdZmG6h5kDO+W+on8qZvn1t/ShmoLUwf1/D AZsg== 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=amxxdAXHf+T+V5jVSBMdwaKz3djF4QdvnVuwfw3/Th4=; b=oe5yfLlp4+2Uxbr+XD5JSB/rP6GrWxbiGaML1eSIcI2NNJcEvPbl+IbILWzcVnYlQA ouIqfNxQEx5HZBdyjMvYf4DXnWiL5oU+B2419T5GOc1s4d8vJIpBaiAlRIiSSQDr5kB7 40Cv8E2FvhzNjzrb3e/oIC0HNM6h7zlhUVVlhhzUFbza8InxdyG9XyUl7NBO+8RByBs7 jVbMQWs5utFKo90k2aarFu/U3aJhWxkuBzeHl3OCVMaQim7Mqgrsm6nDI/X/sTzoyIlb LJDRpsI3Kqv0xqqT96R0DK0o+860cFRcgR7TaS14LuzkQHXEIR2V5EQhk0USOOIPfLYO 88GA== 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 s28si15835527qth.411.2017.09.13.11.18.42; Wed, 13 Sep 2017 11:18:43 -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 3599265DD3; Wed, 13 Sep 2017 18:18:42 +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 014AA65E59; Wed, 13 Sep 2017 15:37:22 +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 6EECA65E4F; Wed, 13 Sep 2017 15:37:15 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 2CEE965C7D for ; Wed, 13 Sep 2017 15:00:17 +0000 (UTC) Received: from mxback14j.mail.yandex.net (mxback14j.mail.yandex.net [IPv6:2a02:6b8:0:1619::90]) by forward105o.mail.yandex.net (Yandex) with ESMTP id D6D43444515A for ; Wed, 13 Sep 2017 18:00:15 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback14j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id O0eIcydPKy-0F5OYV0t; Wed, 13 Sep 2017 18:00:15 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ezxb9lWXfI-0FbaVNGo; Wed, 13 Sep 2017 18: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: Wed, 13 Sep 2017 18:00:05 +0300 Message-Id: <1505314808-20772-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505314808-20772-1-git-send-email-odpbot@yandex.ru> References: <1505314808-20772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 175 Subject: [lng-odp] [PATCH v3 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: 6790672507c1c5394fa99f5fb5f87e6d508a693c **/ .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