ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: Make --with-env and --with-dpdk mutually exclusive

Browse Source 
Also put the DPDK/env options next to each other in configure.

Change-Id: Ic167c37046300e69212ec0b97b6831949f4d60ad
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/444111
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Ben Walker 2019-02-08 14:37:23 -07:00 committed by Darek Stojaczyk
parent 995d60f493
commit 06cc80459f
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configure vendored
View File

@ -27,7 +27,6 @@ function usage()
echo " --enable-pgo-capture Enable generation of profile guided optimization data" echo " --enable-pgo-capture Enable generation of profile guided optimization data"
echo " --enable-pgo-use Use previously captured profile guided optimization data" echo " --enable-pgo-use Use previously captured profile guided optimization data"
echo " --disable-tests Disable building of tests" echo " --disable-tests Disable building of tests"
echo " --with-env=path Use an alternate environment implementation"
echo "" echo ""
echo "Specifying Dependencies:" echo "Specifying Dependencies:"
echo "--with-DEPENDENCY[=path] Use the given dependency. Optionally, provide the" echo "--with-DEPENDENCY[=path] Use the given dependency. Optionally, provide the"
@ -36,14 +35,17 @@ function usage()
echo " disable features and components." echo " disable features and components."
echo "" echo ""
echo "Valid dependencies are listed below." echo "Valid dependencies are listed below."
echo " crypto Required to build vbdev crypto module."
echo " No path required."
echo " dpdk Optional. Uses dpdk submodule in spdk tree if not specified." echo " dpdk Optional. Uses dpdk submodule in spdk tree if not specified."
echo " example: /usr/share/dpdk/x86_64-default-linuxapp-gcc" echo " example: /usr/share/dpdk/x86_64-default-linuxapp-gcc"
echo " env Use an alternate environment implementation instead of DPDK."
echo " Implies --without-dpdk."
echo " igb-uio-driver Build and use DPDK's igb-uio driver instead of uio_pci_generic"
echo " or vfio-pci. Required on some systems to use qat devices"
echo " No path required"
echo " crypto Required to build vbdev crypto module."
echo " No path required."
echo " fio Required to build fio_plugin." echo " fio Required to build fio_plugin."
echo " example: /usr/src/fio" echo " example: /usr/src/fio"
echo " igb-uio-driver Required on some systems to use qat devices"
echo " No path required"
echo " vhost Required to build vhost target." echo " vhost Required to build vhost target."
echo " No path required." echo " No path required."
echo " virtio Required to build vhost initiator (Virtio) bdev module." echo " virtio Required to build vhost initiator (Virtio) bdev module."
@ -172,6 +174,13 @@ for i in "$@"; do
--disable-werror) --disable-werror)
CONFIG[WERROR]=n CONFIG[WERROR]=n
;; ;;
--with-dpdk=*)
check_dir "$i"
CONFIG[DPDK_DIR]=$(readlink -f ${i#*=})
;;
--without-dpdk)
CONFIG[DPDK_DIR]=
;;
--with-env=*) --with-env=*)
CONFIG[ENV]="${i#*=}" CONFIG[ENV]="${i#*=}"
;; ;;
@ -199,13 +208,6 @@ for i in "$@"; do
--without-iscsi-initiator) --without-iscsi-initiator)
CONFIG[ISCSI_INITIATOR]=n CONFIG[ISCSI_INITIATOR]=n
;; ;;
--with-dpdk=*)
check_dir "$i"
CONFIG[DPDK_DIR]=$(readlink -f ${i#*=})
;;
--without-dpdk)
CONFIG[DPDK_DIR]=
;;
--with-crypto) --with-crypto)
CONFIG[CRYPTO]=y CONFIG[CRYPTO]=y
;; ;;
@ -335,6 +337,11 @@ if [ -z "${CONFIG[ENV]}" ]; then
fi fi
fi fi
else else
if [ -n "${CONFIG[DPDK_DIR]}" ]; then
echo "--with-env and --with-dpdk are mutually exclusive."
exit 1
fi
if [ "${CONFIG[VHOST]}" = "y" ]; then if [ "${CONFIG[VHOST]}" = "y" ]; then
echo "Vhost is only supported when using the default DPDK environment. Disabling it." echo "Vhost is only supported when using the default DPDK environment. Disabling it."
fi fi