From 4857d6e2c30de82e94a391b3b2112c6e15b4ad77 Mon Sep 17 00:00:00 2001 From: jinjunzh Date: Mon, 30 May 2022 17:45:26 -0400 Subject: [PATCH] add nasm into docker configuration --- contrib/qpl-cmake/CMakeLists.txt | 12 +----------- docker/test/base/Dockerfile | 1 + 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/contrib/qpl-cmake/CMakeLists.txt b/contrib/qpl-cmake/CMakeLists.txt index b4c3176fe54..c397c5734a2 100644 --- a/contrib/qpl-cmake/CMakeLists.txt +++ b/contrib/qpl-cmake/CMakeLists.txt @@ -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 diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile index 6beab2e5bb7..c89ca065141 100644 --- a/docker/test/base/Dockerfile +++ b/docker/test/base/Dockerfile @@ -55,6 +55,7 @@ RUN apt-get update \ pkg-config \ tzdata \ pv \ + nasm \ --yes --no-install-recommends # Sanitizer options for services (clickhouse-server)