From db89db61b7266a62643421417859663984c8838b Mon Sep 17 00:00:00 2001 From: vansangpfiev Date: Thu, 23 May 2024 15:40:20 +0700 Subject: [PATCH] fix: build ubuntu 18.04 --- .github/workflows/quality-gate.yml | 8 ++++---- third-party/CMakeLists.txt | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/quality-gate.yml b/.github/workflows/quality-gate.yml index ed7feaa..52e52ef 100644 --- a/.github/workflows/quality-gate.yml +++ b/.github/workflows/quality-gate.yml @@ -12,12 +12,12 @@ jobs: strategy: matrix: include: - # - os: "linux" - # name: "amd64" - # runs-on: "ubuntu-18-04" - os: "linux" name: "amd64" - runs-on: "ubuntu-latest" + runs-on: "ubuntu-18-04" + # - os: "linux" + # name: "amd64" + # runs-on: "ubuntu-latest" - os: "mac" name: "arm64" runs-on: "mac-silicon" diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 1e89f94..1bed5e7 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -11,9 +11,6 @@ set(THIRD_PARTY_INSTALL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../build_deps/_install) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") add_compile_options(-fPIC) - - set(CMAKE_INSTALL_RPATH "${THIRD_PARTY_INSTALL_PATH}") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) endif() ExternalProject_Add( @@ -158,7 +155,7 @@ if (UNIX) # APPLE and LINUX Python3 URL https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tgz PREFIX ${THIRD_PARTY_INSTALL_PATH} - CONFIGURE_COMMAND ./configure --prefix= --enable-optimizations --with-ensurepip=install --enable-shared ${PYTHON_INSTALL_CONFIG_HOST} ${PYTHON_INSTALL_CONFIG_BUILD} ${PYTHON_INSTALL_CONFIG_SSL} + CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${THIRD_PARTY_INSTALL_PATH}/lib:${LD_LIBRARY_PATH} ./configure --prefix= --enable-optimizations --with-ensurepip=install --enable-shared ${PYTHON_INSTALL_CONFIG_HOST} ${PYTHON_INSTALL_CONFIG_BUILD} ${PYTHON_INSTALL_CONFIG_SSL} BUILD_COMMAND make -j12 INSTALL_COMMAND make install BUILD_IN_SOURCE 1