Commit 65ed6034 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

configure: Fix check against NASM version 



Currently, NASM in version 2.14 or newer is required. However, the
old code assumed that nasm -v returns version in the form of x.y.z,
however, some builds return only the x.y. In such a case, check would
always fail to detect proper version since the following would be
be always true:

NASM version 2.14

2.14 -> 214 -> [[ 214 -lt "21400" ]]

Change-Id: I63bfc7aa84383bf2d71e936ae534536ecf25723a
Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4809


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 77c4d0f6

configure

+3 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ set -e 
trap 'echo -e "\n\nConfiguration failed\n\n" >&2' ERR



rootdir=$(readlink -f $(dirname $0))

source "$rootdir/scripts/common.sh"



function usage()

{
@@ -158,8 +159,8 @@ fi 


#check nasm only on x86

if [[ $arch == x86_64* ]]; then

	ver=$(nasm -v 2>/dev/null | awk '{print $3}' | sed 's/[^0-9]*//g')

	if [[ "${ver:0:1}" -le "2" ]] && [[ "${ver:0:3}" -le "214" ]] && [[ "${ver:0:5}" -lt "21400" ]]; then

	ver=$(nasm -v 2>/dev/null | awk '{print $3}')

	if lt "$ver" 2.14; then

		# ISA-L, compression & crypto require NASM version 2.14 or newer.

		CONFIG[ISAL]=n

		CONFIG[CRYPTO]=n