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

configure: check nasm only on x86

Browse Source 
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: Richael Zhuang <richael.zhuang@arm.com>
Change-Id: I8ee1a711fc76c25a9173853dbb075dffe7df056b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1208
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Richael Zhuang 2020-03-10 14:04:17 +08:00 committed by Tomasz Zawadzki
parent 817e91b7ce
commit 325010bf91
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -145,8 +145,10 @@ if [[ "$OSTYPE" == "freebsd"* ]]; then
echo "Notice: Vhost, rte_vhost library and virtio are only supported on Linux. Turning off default feature." echo "Notice: Vhost, rte_vhost library and virtio are only supported on Linux. Turning off default feature."
fi fi
ver=$(nasm -v 2>/dev/null | awk '{print $3}' | sed 's/[^0-9]*//g') #check nasm only on x86
if [[ "${ver:0:1}" -le "2" ]] && [[ "${ver:0:3}" -le "213" ]] && [[ "${ver:0:5}" -lt "21303" ]]; then 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. # ISA-L, compression & crypto require NASM version 2.13.03 or newer.
CONFIG[ISAL]=n CONFIG[ISAL]=n
CONFIG[CRYPTO]=n CONFIG[CRYPTO]=n
@ -154,8 +156,9 @@ if [[ "${ver:0:1}" -le "2" ]] && [[ "${ver:0:3}" -le "213" ]] && [[ "${ver:0:5}"
CONFIG[REDUCE]=n CONFIG[REDUCE]=n
HAVE_NASM=n HAVE_NASM=n
echo "Notice: ISA-L, compression & crypto require NASM version 2.13.03 or newer. Turning off default ISA-L and crypto features." echo "Notice: ISA-L, compression & crypto require NASM version 2.13.03 or newer. Turning off default ISA-L and crypto features."
else else
HAVE_NASM=y HAVE_NASM=y
fi
fi fi
function check_dir() { function check_dir() {
@ -613,7 +616,7 @@ if [[ "${CONFIG[FC]}" = "y" ]]; then
fi fi
if [[ "${CONFIG[ISAL]}" = "y" ]] || [[ "${CONFIG[CRYPTO]}" = "y" ]]; then 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 "ERROR: ISA-L, compression & crypto require NASM version 2.13.03 or newer."
echo "Please install or upgrade them re-run this script." echo "Please install or upgrade them re-run this script."
exit 1 exit 1