Commit d172854a authored by Ziye Yang's avatar Ziye Yang Committed by Tomasz Zawadzki
Browse files

configure: Fix the nasm version detection. 



I used the nasm with unstable version while compiling SPDK with ISA-L.
And when running nasm -v, it shows:

NASM version 2.16rc0 compiled on May 27 2021

So the version checking in the script is not correct,
it will get "2.16rc0", but not "2.16".  Then the version comparison
will fail.

This patch will fix such issue when users use an unstable nasm and it
also works for the stable version.

Change-Id: I950458f681642d7e1f5fc69acf2ced2e1342c9cf
Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8082


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent cfff04ae

configure

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ fi 


#check nasm only on x86

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

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

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

	if lt "$ver" 2.14; then

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

		CONFIG[ISAL]=n