Commit 325010bf authored by Richael Zhuang's avatar Richael Zhuang Committed by Tomasz Zawadzki
Browse files

configure: check nasm only on x86 



For other architectures like arm64 don't depend on nasm package
when using isa-l or crypto. Limit the check to x86.

Signed-off-by: default avatarRichael Zhuang <richael.zhuang@arm.com>
Change-Id: I8ee1a711fc76c25a9173853dbb075dffe7df056b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1208


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 817e91b7

configure

+15 −12
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ if [[ "$OSTYPE" == "freebsd"* ]]; then 
	echo "Notice: Vhost, rte_vhost library and virtio are only supported on Linux. Turning off default feature."

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 "213" ]] && [[ "${ver:0:5}" -lt "21303" ]]; then

		# ISA-L, compression & crypto require NASM version 2.13.03 or newer.
@@ -157,6 +159,7 @@ if [[ "${ver:0:1}" -le "2" ]] && [[ "${ver:0:3}" -le "213" ]] && [[ "${ver:0:5}" 
	else

		HAVE_NASM=y

	fi

fi



function check_dir() {

	arg="$1"
@@ -613,7 +616,7 @@ if [[ "${CONFIG[FC]}" = "y" ]]; then 
fi



if [[ "${CONFIG[ISAL]}" = "y" ]] || [[ "${CONFIG[CRYPTO]}" = "y" ]]; then

	if [[ "${HAVE_NASM}" = "n" ]]; then

	if [[ "${HAVE_NASM}" = "n" ]] && [[ $arch == x86_64* ]]; then

		echo "ERROR: ISA-L, compression & crypto require NASM version 2.13.03 or newer."

		echo "Please install or upgrade them re-run this script."

		exit 1