[v1,2/2] travis: build dpdk for general cpu

Message ID 1507302005-12203-3-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • travis: build dpdk for general cpu
Related show

Commit Message

Github ODP bot Oct. 6, 2017, 3 p.m.
From: Maxim Uvarov <maxim.uvarov@linaro.org>


disable cpu optimisations for code run in Travis env.
By default dpdk uses -march=corei7-avx with generates
specific instructions and execution fails with:
Please check that RTE_MACHINE is set correctly.
More info here:
https://github.com/Linaro/odp/pull/218

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
/** Email created from pull request 225 (muvarov:master_dpdkgeneric)
 ** https://github.com/Linaro/odp/pull/225
 ** Patch: https://github.com/Linaro/odp/pull/225.patch
 ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68
 ** Merge commit sha: e5a4683336d35faf8de34981177cc7821b1d30bd
 **/
 .travis.yml              | 2 +-
 scripts/build-pktio-dpdk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/.travis.yml b/.travis.yml
index 7aff2e623..cc7dd404f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -156,7 +156,7 @@  install:
             git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v17.02 http://dpdk.org/git/dpdk dpdk
             pushd dpdk
             git log --oneline --decorate
-            make config T=${TARGET} O=${TARGET}
+            make config T=${TARGET} O=${TARGET} MACHINE_CFLAGS=""
             pushd ${TARGET}
             sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config
             popd
diff --git a/scripts/build-pktio-dpdk b/scripts/build-pktio-dpdk
index 6c6830ac0..4ac263618 100755
--- a/scripts/build-pktio-dpdk
+++ b/scripts/build-pktio-dpdk
@@ -15,7 +15,7 @@  pushd dpdk
 git log --oneline --decorate
 
 #Make and edit DPDK configuration
-make config T=${TARGET} O=${TARGET}
+make config T=${TARGET} O=${TARGET} MACHINE_CFLAGS=""
 pushd ${TARGET}
 #To use I/O without DPDK supported NIC's enable pcap pmd:
 sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config