From: Kefu Chai <kchai@redhat.com>
Date: Wed, 12 Jun 2019 07:21:45 +0000 (+0800)
Subject: cmake/modules/BuildDPDK.cmake: update to adapt upstream changes
X-Git-Tag: v15.1.0~2467^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b848bce504941a076c597f2e4c472212bdd5b64c;p=ceph-ci.git

cmake/modules/BuildDPDK.cmake: update to adapt upstream changes

* update execenv to remove "app", the targets ending with "app" changed
  to the ones without "app" now.
* pass CC by make variables not env variables, otherwise the default
  `cc` is used

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/cmake/modules/BuildDPDK.cmake b/cmake/modules/BuildDPDK.cmake
index 80d54122728..cda191d8cf2 100644
--- a/cmake/modules/BuildDPDK.cmake
+++ b/cmake/modules/BuildDPDK.cmake
@@ -38,9 +38,9 @@ function(do_build_dpdk dpdk_dir)
   endif()
   set(dpdk_rte_CFLAGS "${rte_cflags}" CACHE INTERNAL "")
   if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(execenv "linuxapp")
+    set(execenv "linux")
   elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-    set(execenv "bsdapp")
+    set(execenv "freebsd")
   else()
     message(FATAL_ERROR "not able to build DPDK support: "
       "unsupported OS \"${CMAKE_SYSTEM_NAME}\"")
@@ -83,7 +83,7 @@ function(do_build_dpdk dpdk_dir)
   ExternalProject_Add(dpdk-ext
     SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/spdk/dpdk
     CONFIGURE_COMMAND ${make_cmd} config O=${dpdk_dir} T=${target}
-    BUILD_COMMAND env CC=${CMAKE_C_COMPILER} ${make_cmd} O=${dpdk_dir} EXTRA_CFLAGS=-fPIC
+    BUILD_COMMAND ${make_cmd} O=${dpdk_dir} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=-fPIC
     BUILD_IN_SOURCE 1
     INSTALL_COMMAND "true")
   ExternalProject_Add_Step(dpdk-ext patch-config