d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure: Correctly hyphenate ISA-L

Browse Source 
Change-Id: If5d40ed4784fecd50f5d675512a8f2f9f9967492
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/442624
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Chunyang Hui <chunyang.hui@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
Ben Walker 2019-01-29 12:08:53 -07:00 committed by Darek Stojaczyk
parent a89dbbffa2
commit 7b74567eb1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -396,7 +396,7 @@ fi
if [[ "${CONFIG[ISAL]}" = "y" ]] || [[ "${CONFIG[CRYPTO]}" = "y" ]]; then if [[ "${CONFIG[ISAL]}" = "y" ]] || [[ "${CONFIG[CRYPTO]}" = "y" ]]; then
if [[ $(nasm -v | sed 's/[^0-9]*//g' | awk '{print substr ($0, 0, 5)}') -lt "21202" ]]; then if [[ $(nasm -v | sed 's/[^0-9]*//g' | awk '{print substr ($0, 0, 5)}') -lt "21202" ]]; then
echo "Notice: ISAL, compression & crypto auto-disabled due to nasm dependency." echo "Notice: ISA-L, compression & crypto auto-disabled due to nasm dependency."
echo "These features require NASM version 2.12.02 or newer. Please install" echo "These features require NASM version 2.12.02 or newer. Please install"
echo "or upgrade then re-run this script." echo "or upgrade then re-run this script."
CONFIG[ISAL]=n CONFIG[ISAL]=n
@ -417,7 +417,7 @@ if [[ "${CONFIG[ISAL]}" = "y" ]]; then
fi fi
if [[ "${CONFIG[RBD]}" = "y" ]]; then if [[ "${CONFIG[RBD]}" = "y" ]]; then
echo "ISAL and RBD cannot co-exist currently so disabling ISAL." echo "ISA-L and RBD cannot co-exist currently so disabling ISA-L."
CONFIG[ISAL]=n CONFIG[ISAL]=n
else else
cd $rootdir/isa-l cd $rootdir/isa-l