add nasm into docker configuration

This commit is contained in:
jinjunzh 2022-05-30 17:45:26 -04:00
parent f413b49364
commit 4857d6e2c3
2 changed files with 2 additions and 11 deletions

View File

@ -28,17 +28,7 @@ include("${QPL_PROJECT_DIR}/cmake/CompileOptions.cmake")
include(CheckLanguage)
check_language(ASM_NASM)
if(NOT CMAKE_ASM_NASM_COMPILER)
set (NASM_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/nasm")
set (NASM_BINARY_DIR "${ClickHouse_SOURCE_DIR}/build/contrib/nasm")
message(WARNING "Trying to build NASM from ${NASM_SOURCE_DIR} because NASM could not be found on local machine")
execute_process(COMMAND
bash -c "./autogen.sh && ./configure --prefix=${NASM_BINARY_DIR} && make install"
WORKING_DIRECTORY ${NASM_SOURCE_DIR}
RESULT_VARIABLE variable_RESULT)
message(STATUS "NASM build result:${variable_RESULT}")
set(CMAKE_ASM_NASM_COMPILER ${NASM_BINARY_DIR}/bin/nasm)
message(FATAL_ERROR "Please install NASM from 'https://github.com/netwide-assembler/nasm' because NASM compiler could not be found on local machine!")
endif()
# [SUBDIR]isal

View File

@ -55,6 +55,7 @@ RUN apt-get update \
pkg-config \
tzdata \
pv \
nasm \
--yes --no-install-recommends
# Sanitizer options for services (clickhouse-server)