From 982f3c3e040316b61f9851bf9999d23ef63e40f8 Mon Sep 17 00:00:00 2001 From: ruoxi Date: Sat, 12 Feb 2022 09:45:38 +0800 Subject: [PATCH] Update toolchain by removing useless dependencies (#4002) --- CMakeLists.txt | 3 -- .../release-centos7/build/build-tiflash-ci.sh | 2 - .../build/build-tiflash-release.sh | 4 -- .../build/build-tiflash-ut-coverage.sh | 1 - .../release-centos7/build/static-analysis.sh | 1 - .../misc/bake_llvm_base_aarch64.sh | 9 ----- .../dockerfiles/misc/bake_llvm_base_amd64.sh | 9 ----- .../dockerfiles/misc/install_curl.sh | 20 ---------- .../dockerfiles/misc/install_openssl.sh | 28 ------------- .../dockerfiles/misc/prepare_basic.sh | 2 +- .../dockerfiles/tiflash-llvm-base-aarch64 | 1 - .../dockerfiles/tiflash-llvm-base-amd64 | 1 - release-centos7-llvm/env/loader | 1 - release-centos7-llvm/env/prepare-sysroot.sh | 40 ------------------- .../scripts/build-tiflash-ci.sh | 2 - .../scripts/build-tiflash-release.sh | 2 - .../scripts/build-tiflash-ut-coverage.sh | 1 - .../scripts/static-analysis.sh | 1 - release-darwin/README.md | 1 + release-darwin/build/build-release.sh | 4 -- 20 files changed, 2 insertions(+), 131 deletions(-) delete mode 100644 release-centos7-llvm/dockerfiles/misc/install_curl.sh delete mode 100644 release-centos7-llvm/dockerfiles/misc/install_openssl.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e732e6e5ff..04961710a94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,9 +348,6 @@ include (libs/libcommon/cmake/find_gperftools.cmake) include (libs/libcommon/cmake/find_jemalloc.cmake) include (libs/libcommon/cmake/find_mimalloc.cmake) include (libs/libcommon/cmake/find_cctz.cmake) -if (ENABLE_MYSQL_STORAGE) - include (libs/libmysqlxx/cmake/find_mysqlclient.cmake) -endif() include (cmake/print_flags.cmake) diff --git a/deprecated/release-centos7/build/build-tiflash-ci.sh b/deprecated/release-centos7/build/build-tiflash-ci.sh index a17e5a016b6..ee2a98f4f9b 100755 --- a/deprecated/release-centos7/build/build-tiflash-ci.sh +++ b/deprecated/release-centos7/build/build-tiflash-ci.sh @@ -51,7 +51,6 @@ fi NPROC=${NPROC:-$(nproc || grep -c ^processor /proc/cpuinfo)} ENABLE_TESTS=${ENABLE_TESTS:-1} -ENABLE_EMBEDDED_COMPILER="FALSE" UPDATE_CCACHE=${UPDATE_CCACHE:-false} BUILD_UPDATE_DEBUG_CI_CCACHE=${BUILD_UPDATE_DEBUG_CI_CCACHE:-false} CCACHE_REMOTE_TAR="${BUILD_BRANCH}-${CMAKE_BUILD_TYPE}.tar" @@ -121,7 +120,6 @@ BUILD_DIR="$SRCPATH/release-centos7/build-release" rm -rf ${BUILD_DIR} mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} cmake "$SRCPATH" \ - -DENABLE_EMBEDDED_COMPILER=$ENABLE_EMBEDDED_COMPILER \ -DENABLE_TESTS=${ENABLE_TESTS} \ -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ -DUSE_CCACHE=${USE_CCACHE} \ diff --git a/deprecated/release-centos7/build/build-tiflash-release.sh b/deprecated/release-centos7/build/build-tiflash-release.sh index 281e22ec5f0..e42c5257ebe 100755 --- a/deprecated/release-centos7/build/build-tiflash-release.sh +++ b/deprecated/release-centos7/build/build-tiflash-release.sh @@ -18,7 +18,6 @@ set -ueox pipefail SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" SRCPATH=$(cd ${SCRIPTPATH}/../..; pwd -P) NPROC=${NPROC:-$(nproc || grep -c ^processor /proc/cpuinfo)} -ENABLE_EMBEDDED_COMPILER="FALSE" INSTALL_DIR="${SRCPATH}/release-centos7/tiflash" @@ -31,9 +30,6 @@ rm -rf ${BUILD_DIR} && mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} cmake "${SRCPATH}" ${DEFINE_CMAKE_PREFIX_PATH} \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ - -DENABLE_EMBEDDED_COMPILER=${ENABLE_EMBEDDED_COMPILER} \ - -DENABLE_ICU=OFF \ - -DENABLE_MYSQL=OFF \ -DENABLE_TESTING=OFF \ -DENABLE_TESTS=OFF \ -Wno-dev \ diff --git a/deprecated/release-centos7/build/build-tiflash-ut-coverage.sh b/deprecated/release-centos7/build/build-tiflash-ut-coverage.sh index 32153f47a16..17ac8c22bde 100755 --- a/deprecated/release-centos7/build/build-tiflash-ut-coverage.sh +++ b/deprecated/release-centos7/build/build-tiflash-ut-coverage.sh @@ -104,7 +104,6 @@ BUILD_DIR="/build/release-centos7/build-release" rm -rf ${BUILD_DIR} mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} cmake "${SRCPATH}" \ - -DENABLE_EMBEDDED_COMPILER=FALSE \ -DENABLE_TESTS=ON \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ -DUSE_CCACHE=${USE_CCACHE} \ diff --git a/deprecated/release-centos7/build/static-analysis.sh b/deprecated/release-centos7/build/static-analysis.sh index b9c256c1ae4..c9279248b00 100755 --- a/deprecated/release-centos7/build/static-analysis.sh +++ b/deprecated/release-centos7/build/static-analysis.sh @@ -50,7 +50,6 @@ if [[ "${ENABLE_CLANG_TIDY_CHECK}" == "true" ]]; then cd ${BUILD_DIR} cmake "${SRCPATH}" \ - -DENABLE_EMBEDDED_COMPILER=FALSE \ -DENABLE_TESTS=0 \ -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \ -DUSE_CCACHE=OFF \ diff --git a/release-centos7-llvm/dockerfiles/misc/bake_llvm_base_aarch64.sh b/release-centos7-llvm/dockerfiles/misc/bake_llvm_base_aarch64.sh index 2954b6c840a..71ba033e4b1 100644 --- a/release-centos7-llvm/dockerfiles/misc/bake_llvm_base_aarch64.sh +++ b/release-centos7-llvm/dockerfiles/misc/bake_llvm_base_aarch64.sh @@ -26,11 +26,6 @@ function bake_llvm_base_aarch64() { export CXX=clang++ export LD=ld.lld - # OpenSSL - source $SCRIPTPATH/install_openssl.sh - install_openssl "1_1_1l" - export OPENSSL_ROOT_DIR="/usr/local/opt/openssl" - # Go source $SCRIPTPATH/install_go.sh install_go "1.17" "arm64" @@ -41,10 +36,6 @@ function bake_llvm_base_aarch64() { install_rust source $HOME/.cargo/env - # Curl - source $SCRIPTPATH/install_curl.sh - install_curl "7.80.0" - # ccache source $SCRIPTPATH/install_ccache.sh install_ccache "4.5.1" diff --git a/release-centos7-llvm/dockerfiles/misc/bake_llvm_base_amd64.sh b/release-centos7-llvm/dockerfiles/misc/bake_llvm_base_amd64.sh index bcd96aff5fd..92225ebb91f 100644 --- a/release-centos7-llvm/dockerfiles/misc/bake_llvm_base_amd64.sh +++ b/release-centos7-llvm/dockerfiles/misc/bake_llvm_base_amd64.sh @@ -25,11 +25,6 @@ function bake_llvm_base_amd64() { export CXX=clang++ export LD=ld.lld - # OpenSSL - source $SCRIPTPATH/install_openssl.sh - install_openssl "1_1_1l" - export OPENSSL_ROOT_DIR="/usr/local/opt/openssl" - # Go source $SCRIPTPATH/install_go.sh install_go "1.17" "amd64" @@ -40,10 +35,6 @@ function bake_llvm_base_amd64() { install_rust source $HOME/.cargo/env - # Curl - source $SCRIPTPATH/install_curl.sh - install_curl "7.80.0" - # ccache source $SCRIPTPATH/install_ccache.sh install_ccache "4.5.1" diff --git a/release-centos7-llvm/dockerfiles/misc/install_curl.sh b/release-centos7-llvm/dockerfiles/misc/install_curl.sh deleted file mode 100644 index 113347af4f0..00000000000 --- a/release-centos7-llvm/dockerfiles/misc/install_curl.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash -# Copyright (C) 2021 PingCAP, Inc. - -# Install cURL for CI/CD. -# Require: wget, tar, make - -function install_curl() { - # $1: curl_version - NPROC=$(nproc || grep -c ^processor /proc/cpuinfo) - ENCODED_VERSION=$(echo $1 | tr . _) - wget https://github.com/curl/curl/releases/download/curl-$ENCODED_VERSION/curl-$1.tar.gz && \ - tar zxf curl-$1.tar.gz && \ - cd curl-$1 && \ - ./configure --with-openssl=/usr/local/opt/openssl --disable-shared && \ - make -j ${NPROC} && \ - make install && \ - cd .. && \ - rm -rf curl-$1 && \ - rm -rf curl-$1.tar.gz -} \ No newline at end of file diff --git a/release-centos7-llvm/dockerfiles/misc/install_openssl.sh b/release-centos7-llvm/dockerfiles/misc/install_openssl.sh deleted file mode 100644 index e8077dfd530..00000000000 --- a/release-centos7-llvm/dockerfiles/misc/install_openssl.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -# Copyright (C) 2021 PingCAP, Inc. - -# Install openssl for CI/CD. -# Require: wget, tar - -function install_openssl() { - # $1: openssl_version - wget https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_$1.tar.gz - tar xvf OpenSSL_$1.tar.gz - cd openssl-OpenSSL_$1 - - ./config \ - -fPIC \ - no-shared \ - no-afalgeng \ - --prefix=/usr/local/opt/openssl \ - --openssldir=/usr/local/opt/openssl \ - -static - - NPROC=${NPROC:-$(nproc || grep -c ^processor /proc/cpuinfo)} - make -j ${NPROC} - make install_sw install_ssldirs - - cd .. - rm -rf openssl-OpenSSL_$1 - rm -rf OpenSSL_$1.tar.gz -} \ No newline at end of file diff --git a/release-centos7-llvm/dockerfiles/misc/prepare_basic.sh b/release-centos7-llvm/dockerfiles/misc/prepare_basic.sh index b7603e2e5dc..28266c4b6c4 100644 --- a/release-centos7-llvm/dockerfiles/misc/prepare_basic.sh +++ b/release-centos7-llvm/dockerfiles/misc/prepare_basic.sh @@ -15,7 +15,7 @@ function prepare_basic() { python3-devel \ bzip2 \ chrpath \ - yum install -y git perl wget cmake3 glibc-static zlib-static diffutils ninja-build devtoolset-10 + yum install -y curl git perl wget cmake3 glibc-static zlib-devel diffutils ninja-build devtoolset-10 yum -y install 'perl(Data::Dumper)' yum clean all -y } diff --git a/release-centos7-llvm/dockerfiles/tiflash-llvm-base-aarch64 b/release-centos7-llvm/dockerfiles/tiflash-llvm-base-aarch64 index b052e92add6..cb498762c2a 100644 --- a/release-centos7-llvm/dockerfiles/tiflash-llvm-base-aarch64 +++ b/release-centos7-llvm/dockerfiles/tiflash-llvm-base-aarch64 @@ -8,7 +8,6 @@ ENV PATH="/opt/cmake/bin:/usr/local/bin/:${PATH}:/usr/local/go/bin:/root/.cargo/ LIBRARY_PATH="/usr/local/lib/aarch64-unknown-linux-gnu/:${LIBRARY_PATH}" \ LD_LIBRARY_PATH="/usr/local/lib/aarch64-unknown-linux-gnu/:${LD_LIBRARY_PATH}" \ CPLUS_INCLUDE_PATH="/usr/local/include/aarch64-unknown-linux-gnu/c++/v1/:${CPLUS_INCLUDE_PATH}" \ - OPENSSL_ROOT_DIR="/usr/local/opt/openssl" \ CC=clang \ CXX=clang++ \ LD=ld.lld diff --git a/release-centos7-llvm/dockerfiles/tiflash-llvm-base-amd64 b/release-centos7-llvm/dockerfiles/tiflash-llvm-base-amd64 index ad41b12ac0c..d6822234b2c 100644 --- a/release-centos7-llvm/dockerfiles/tiflash-llvm-base-amd64 +++ b/release-centos7-llvm/dockerfiles/tiflash-llvm-base-amd64 @@ -8,7 +8,6 @@ ENV PATH="/opt/cmake/bin:/usr/local/bin/:${PATH}:/usr/local/go/bin:/root/.cargo/ LIBRARY_PATH="/usr/local/lib/x86_64-unknown-linux-gnu/:${LIBRARY_PATH}" \ LD_LIBRARY_PATH="/usr/local/lib/x86_64-unknown-linux-gnu/:${LD_LIBRARY_PATH}" \ CPLUS_INCLUDE_PATH="/usr/local/include/x86_64-unknown-linux-gnu/c++/v1/:${CPLUS_INCLUDE_PATH}" \ - OPENSSL_ROOT_DIR="/usr/local/opt/openssl" \ CC=clang \ CXX=clang++ \ LD=ld.lld diff --git a/release-centos7-llvm/env/loader b/release-centos7-llvm/env/loader index c19b10ed9e2..66dc663d38a 100755 --- a/release-centos7-llvm/env/loader +++ b/release-centos7-llvm/env/loader @@ -26,7 +26,6 @@ libdir = "{}lib/".format(sysroot) triple = "{}-unknown-linux-gnu".format(platform.machine()) shell = os.getenv('SHELL', '/bin/sh') env = { - "OPENSSL_ROOT_DIR" : sysroot, "PS1" : "[\\u@\\h \\W] (TiFlash) > ", "CMAKE_PREFIX_PATH" : sysroot, "PATH" : ":".join([bindir, sysroot + "go/bin/", os.getenv("PATH", "")]), diff --git a/release-centos7-llvm/env/prepare-sysroot.sh b/release-centos7-llvm/env/prepare-sysroot.sh index d3435a1879e..3bc1f5fa881 100755 --- a/release-centos7-llvm/env/prepare-sysroot.sh +++ b/release-centos7-llvm/env/prepare-sysroot.sh @@ -8,11 +8,9 @@ GO_VERSION="1.17" ARCH=$(uname -m) GO_ARCH=$([[ "$ARCH" == "aarch64" ]] && echo "arm64" || echo "amd64") LLVM_VERSION="13.0.0" -CURL_VERSION="7.80.0" CCACHE_VERSION="4.5.1" SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" SYSROOT="$SCRIPTPATH/sysroot" -OPENSSL_VERSION="1_1_1l" function install_cmake() { wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-$ARCH.sh @@ -50,48 +48,12 @@ function install_llvm() { rm -rf llvm-project } -function install_openssl() { - wget https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_${OPENSSL_VERSION}.tar.gz - tar xvf OpenSSL_${OPENSSL_VERSION}.tar.gz - cd openssl-OpenSSL_${OPENSSL_VERSION} - - ./config \ - -fPIC \ - no-shared \ - no-afalgeng \ - --prefix="$SYSROOT" \ - --openssldir="$SYSROOT" \ - -static - - NPROC=${NPROC:-$(nproc || grep -c ^processor /proc/cpuinfo)} - make -j ${NPROC} - make install_sw install_ssldirs - - cd .. - rm -rf openssl-OpenSSL_${OPENSSL_VERSION} - rm -rf OpenSSL_${OPENSSL_VERSION}.tar.gz -} - function install_go() { wget https://dl.google.com/go/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz tar -C "$SYSROOT" -xzvf go${GO_VERSION}.linux-${GO_ARCH}.tar.gz rm -rf go${GO_VERSION}.linux-${GO_ARCH}.tar.gz } -function install_curl() { - NPROC=$(nproc || grep -c ^processor /proc/cpuinfo) - ENCODED_VERSION=$(echo $CURL_VERSION | tr . _) - wget https://github.com/curl/curl/releases/download/curl-$ENCODED_VERSION/curl-$CURL_VERSION.tar.gz && \ - tar zxf curl-$CURL_VERSION.tar.gz && \ - cd curl-$CURL_VERSION && \ - ./configure --with-openssl="$SYSROOT" --disable-shared --prefix=$SYSROOT && \ - make -j ${NPROC} && \ - make install && \ - cd .. && \ - rm -rf curl-$CURL_VERSION && \ - rm -rf curl-$CURL_VERSION.tar.gz -} - function install_ccache() { wget "https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz" tar xvaf "ccache-${CCACHE_VERSION}.tar.gz" && rm -rf "ccache-${CCACHE_VERSION}.tar.gz" @@ -113,9 +75,7 @@ mkdir -p $SYSROOT install_cmake install_llvm -install_openssl install_go -install_curl install_ccache # some extra steps diff --git a/release-centos7-llvm/scripts/build-tiflash-ci.sh b/release-centos7-llvm/scripts/build-tiflash-ci.sh index 52c1052a4f3..8f15f61772e 100755 --- a/release-centos7-llvm/scripts/build-tiflash-ci.sh +++ b/release-centos7-llvm/scripts/build-tiflash-ci.sh @@ -52,7 +52,6 @@ fi NPROC=${NPROC:-$(nproc || grep -c ^processor /proc/cpuinfo)} ENABLE_TESTS=${ENABLE_TESTS:-1} -ENABLE_EMBEDDED_COMPILER="FALSE" UPDATE_CCACHE=${UPDATE_CCACHE:-false} BUILD_UPDATE_DEBUG_CI_CCACHE=${BUILD_UPDATE_DEBUG_CI_CCACHE:-false} CCACHE_REMOTE_TAR="${BUILD_BRANCH}-${CMAKE_BUILD_TYPE}-llvm.tar" @@ -125,7 +124,6 @@ BUILD_DIR="$SRCPATH/release-centos7-llvm/build-release" rm -rf ${BUILD_DIR} mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} cmake "$SRCPATH" ${CMAKE_PREBUILT_LIBS_ROOT_ARG} \ - -DENABLE_EMBEDDED_COMPILER=$ENABLE_EMBEDDED_COMPILER \ -DENABLE_TESTS=${ENABLE_TESTS} \ -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ -DUSE_CCACHE=${USE_CCACHE} \ diff --git a/release-centos7-llvm/scripts/build-tiflash-release.sh b/release-centos7-llvm/scripts/build-tiflash-release.sh index 633ac96fe2d..d8332e4cad4 100755 --- a/release-centos7-llvm/scripts/build-tiflash-release.sh +++ b/release-centos7-llvm/scripts/build-tiflash-release.sh @@ -21,7 +21,6 @@ set -ueox pipefail SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" SRCPATH=$(cd ${SCRIPTPATH}/../..; pwd -P) -ENABLE_EMBEDDED_COMPILER="FALSE" INSTALL_DIR="${SRCPATH}/release-centos7-llvm/tiflash" BUILD_DIR="${SRCPATH}/release-centos7-llvm/build-release" @@ -29,7 +28,6 @@ rm -rf ${BUILD_DIR} && mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} cmake "${SRCPATH}" ${DEFINE_CMAKE_PREFIX_PATH} \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ - -DENABLE_EMBEDDED_COMPILER=${ENABLE_EMBEDDED_COMPILER} \ -DENABLE_TESTING=OFF \ -DENABLE_TESTS=OFF \ -Wno-dev \ diff --git a/release-centos7-llvm/scripts/build-tiflash-ut-coverage.sh b/release-centos7-llvm/scripts/build-tiflash-ut-coverage.sh index bfae9d7eeb6..beb2698118a 100755 --- a/release-centos7-llvm/scripts/build-tiflash-ut-coverage.sh +++ b/release-centos7-llvm/scripts/build-tiflash-ut-coverage.sh @@ -86,7 +86,6 @@ BUILD_DIR="/build/release-centos7-llvm/build-release" rm -rf ${BUILD_DIR} mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} cmake "${SRCPATH}" \ - -DENABLE_EMBEDDED_COMPILER=FALSE \ -DENABLE_TESTS=ON \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ -DUSE_CCACHE=${USE_CCACHE} \ diff --git a/release-centos7-llvm/scripts/static-analysis.sh b/release-centos7-llvm/scripts/static-analysis.sh index ff5c85ceb4f..e35d5e49c55 100755 --- a/release-centos7-llvm/scripts/static-analysis.sh +++ b/release-centos7-llvm/scripts/static-analysis.sh @@ -35,7 +35,6 @@ if [[ "${ENABLE_CLANG_TIDY_CHECK}" == "true" ]]; then cd ${BUILD_DIR} cmake "${SRCPATH}" \ - -DENABLE_EMBEDDED_COMPILER=FALSE \ -DENABLE_TESTS=0 \ -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \ -DUSE_CCACHE=OFF \ diff --git a/release-darwin/README.md b/release-darwin/README.md index 45d693909e6..08a43b9ae6d 100644 --- a/release-darwin/README.md +++ b/release-darwin/README.md @@ -11,3 +11,4 @@ Following OS are tested OK Your system needs to install * python 3.7 +* openssl 1.1 diff --git a/release-darwin/build/build-release.sh b/release-darwin/build/build-release.sh index a6a12c32e2e..6d9f1fb9efd 100755 --- a/release-darwin/build/build-release.sh +++ b/release-darwin/build/build-release.sh @@ -7,7 +7,6 @@ SRCPATH=${1:-$(cd $SCRIPTPATH/../..; pwd -P)} PATH=$PATH:/root/.cargo/bin NPROC=${NPROC:-$(sysctl -n hw.physicalcpu || grep -c ^processor /proc/cpuinfo)} CMAKE_BUILD_TYPE="RELWITHDEBINFO" -ENABLE_EMBEDDED_COMPILER="FALSE" install_dir="$SRCPATH/release-darwin/tiflash" if [ -d "$install_dir" ]; then rm -rf "${install_dir:?}"/*; else mkdir -p "$install_dir"; fi @@ -16,9 +15,6 @@ rm -rf $build_dir && mkdir -p $build_dir && cd $build_dir cmake "$SRCPATH" \ -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ - -DENABLE_EMBEDDED_COMPILER=$ENABLE_EMBEDDED_COMPILER \ - -DENABLE_ICU=OFF \ - -DENABLE_MYSQL=OFF \ -Wno-dev \ -DNO_WERROR=ON