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

configure: Move checks for nasm and ipsec

Browse Source 
The way they were previously being checked was triggering the trap and
printing out a "Configuration failed" message even though the
configuration was successful.

Change-Id: I9de4f390c603631ebf5af5555ea7164aae2b6213
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/428663
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2018-10-10 08:00:30 -07:00 committed by Jim Harris
parent 5c263046db
commit 2b6d9ce21f
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -347,16 +347,12 @@ fi
if [[ "${CONFIG[CRYPTO]}" = "y" ]]; then if [[ "${CONFIG[CRYPTO]}" = "y" ]]; then
echo NOTE: Crypto is currently marked as experimental. Do not use in production. echo NOTE: Crypto is currently marked as experimental. Do not use in production.
set +e if [[ $(nasm -v | sed 's/[^0-9]*//g' | awk '{print substr ($0, 0, 5)}') -lt "21202" ]]; then
nasm_ver=$(nasm -v | sed 's/[^0-9]*//g' | awk '{print substr ($0, 0, 5)}')
ipsec="$(find /usr -name intel-ipsec-mb.h 2>/dev/null)"
set -e
if [[ $nasm_ver -lt "21202" ]]; then
echo Crypto requires NASM version 2.12.02 or newer. Please install echo Crypto requires 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.
exit 1 exit 1
else else
if [[ "$ipsec" == "" ]]; then if [[ "$(find /usr -name intel-ipsec-mb.h 2>/dev/null)" == "" ]]; then
echo "To enable crypto you must first go to the intel-ipsec-mb directory and " echo "To enable crypto you must first go to the intel-ipsec-mb directory and "
echo "run 'make' then 'sudo make install' then re-run this script." echo "run 'make' then 'sudo make install' then re-run this script."
exit 1 exit 1