From patchwork Sat Jan 20 23:00:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125265 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp459194ljf; Sat, 20 Jan 2018 15:03:25 -0800 (PST) X-Google-Smtp-Source: AH8x226Es3iexWQze6UOuvk1Kk+ocKKsDdNr4kgdw4fv965i0UiEBKflvRfbO2gBs/EsRCkEIuOu X-Received: by 10.200.54.138 with SMTP id a10mr4289039qtc.123.1516489405564; Sat, 20 Jan 2018 15:03:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516489405; cv=none; d=google.com; s=arc-20160816; b=k/DYoNo0GsguivhetDywr1lr9aVD62Tfzznks2ZKBOBYFQmYeO5hIs1gph7VGmwhOb C3Tow6CnXpJQIXTL4bS3JODuPeYh1nE3dHboKd9x5HRHF56rObwVYCVute0K89DIuNk1 SeRH6681N4Iu3M+pEUnE6WCiKczU/b0ydPNXBwDkC5sfjDVLfeFaqjkf8S/zezKe9Na/ wYnF2MVJhCbnX93P6CpTfpc2Oge/dkXdJQjVw5636KZfRTGakTXVhgQqvEO2mQMHXiYL hB3xVrBnEnPFDf17NmKfdgJ8DsCAy53I3Yl4nyL5KdVVjvPwA2TEnyHNQL1rpAUIgzO2 tPag== 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=QgBE61M0REErdxqA+sZDVBv567HyUHRf0syNdnGE2E4=; b=0NrMe1Rk24Z/OHDNP5xpuMb3DgcG7njP/pGuXLVGKwDRURAZMSNxXU3fH1a3m9dwAp rwR/JsbkQAoo5JWJal+KeWLpNzPFssOdfYkuQIrNRR/33nkoJp6JA3zn9uCT+nWaunVe iyl6NtWCBFiALPbXOZGQswOOKWSnu5MyTm8S3hKJNwbzP79MqHVTD1oIfFyj8X7+5jFt rujEmaZLIonH96/GYL6DC3sy5lqYyElVc9hwP6+yF8+X/PhKdh9mX70Fz9c5JiFfUBC8 +FJr4+yL/deZxxzdQ5DGybBb8o1yR5JPS1Kb6o4WBZ7gvq0rTKMaHySf3CfC0Z6TGH0T SZ1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id u26si1431301qtc.358.2018.01.20.15.03.25; Sat, 20 Jan 2018 15:03:25 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 3D796617C9; Sat, 20 Jan 2018 23:03:25 +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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 7C5D6617E9; Sat, 20 Jan 2018 23:00:38 +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 DCA9161797; Sat, 20 Jan 2018 23:00:20 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id C81A561725 for ; Sat, 20 Jan 2018 23:00:16 +0000 (UTC) Received: from mxback7o.mail.yandex.net (mxback7o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::21]) by forward103j.mail.yandex.net (Yandex) with ESMTP id D455A34C1937 for ; Sun, 21 Jan 2018 02:00:15 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback7o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id JH0aKtV8ow-0FT4brxN; Sun, 21 Jan 2018 02:00:15 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id f7FG0x0HdC-0Fu8VXRd; Sun, 21 Jan 2018 02: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: Sun, 21 Jan 2018 02:00:11 +0300 Message-Id: <1516489211-26156-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516489211-26156-1-git-send-email-odpbot@yandex.ru> References: <1516489211-26156-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 412 Subject: [lng-odp] [PATCH v4 5/5] travis: move --with-dpdk-path out of DPDK build if 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 1b285bbd (travis: also use DPDK when doing cross-compile tests) moved adding --with-dpdk-path to EXTRA_CONF to be executed under DPDK-building if. Move it outside of that if, so that DPDK is enabled even if it's prebuilt. Fixes: 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 412 (lumag:travis-upd) ** https://github.com/Linaro/odp/pull/412 ** Patch: https://github.com/Linaro/odp/pull/412.patch ** Base sha: 5a4502fc6bc53e6503169da3028f456b64811a0b ** Merge commit sha: 15e457a4db3005d5fe8a7847e25657675bcc88ce **/ .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 666b56eed..bad1eba19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -196,7 +196,8 @@ install: ;; esac - | - if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then + if [ -n "$TARGET" ] ; then + if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate @@ -220,7 +221,8 @@ install: make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd - EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" + fi + EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" fi # Netmap pktio