From b504d3e36ac6e905a8f33b804c0596362d227345 Mon Sep 17 00:00:00 2001 From: zzh Date: Fri, 11 Apr 2025 15:32:42 +0800 Subject: [PATCH] fix sys dependency --- build/build_all.sh | 18 +- buildtools/python3/build.sh | 4 +- dependency/aws-sdk-cpp/build.sh | 12 +- dependency/build/build_dependency.sh | 248 +++++++++++++------------- dependency/cryptography/build.sh | 6 +- dependency/grpc/build_common.sh | 6 +- dependency/kerberos/build.py | 8 +- dependency/libevent/build.sh | 4 +- dependency/masstree/build.sh | 4 + dependency/masstree/string_base.patch | 12 ++ dependency/nghttp2/build.sh | 2 +- 11 files changed, 170 insertions(+), 154 deletions(-) create mode 100644 dependency/masstree/string_base.patch diff --git a/build/build_all.sh b/build/build_all.sh index 072559205..af851975c 100644 --- a/build/build_all.sh +++ b/build/build_all.sh @@ -25,19 +25,19 @@ fi # checksum for all package before building python3 ./checksum.py -echo --------------------------------openssl------------------------------------------------- -start_tm=$(date +%s%N) -[ -f build_result.log ] && rm -rf build_result.log -cd $(pwd)/../dependency/openssl -python3 build.py -m all -f openssl-1.1.1m.tar.gz -t "comm|llt" >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[openssl] $use_tm" +#echo --------------------------------openssl------------------------------------------------- +#start_tm=$(date +%s%N) +#[ -f build_result.log ] && rm -rf build_result.log +#cd $(pwd)/../dependency/openssl +#python3 build.py -m all -f openssl-1.1.1m.tar.gz -t "comm|llt" >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[openssl] $use_tm" echo --------------------------------tassl------------------------------------------------- start_tm=$(date +%s%N) [ -f build_result.log ] && rm -rf build_result.log -cd $(pwd)/../tassl +cd $(pwd)/../dependency/tassl python3 build.py -m all -f TASSL-1.1.1-master.tar.gz -t "comm|llt" >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") diff --git a/buildtools/python3/build.sh b/buildtools/python3/build.sh index 1ab881710..0dfc24b79 100644 --- a/buildtools/python3/build.sh +++ b/buildtools/python3/build.sh @@ -11,7 +11,7 @@ set -e # Use for Plpython3u PLATFORM=$(sh $(pwd)/../../build/get_PlatForm_str.sh) -SSL_PATH=$(pwd)/../../output/kernel/dependency/openssl/comm/ +SSL_PATH=/usr if [ ! -d $SSL_PATH ]; then echo "Openssl in output dir is not exist. Please build openssl first." exit 0 @@ -32,7 +32,7 @@ sed -i "s#/usr/local/ssl#${SSL_PATH}#" ./Modules/Setup.dist rm -rf $(pwd)/build_py37 mkdir $(pwd)/build_py37 -export LD_LIBRARY_PATH=SSL_PATH/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${SSL_PATH}/lib64:$LD_LIBRARY_PATH #compile python3 ./configure --enable-shared CFLAGS='-fPIC -fstack-protector-strong -g -O2 -Wl,-z,relro,-z,now,-z,noexecstack' LDFLAGS='-Wl,-z,relro,-z,now' \ diff --git a/dependency/aws-sdk-cpp/build.sh b/dependency/aws-sdk-cpp/build.sh index a9dd67513..99015211f 100644 --- a/dependency/aws-sdk-cpp/build.sh +++ b/dependency/aws-sdk-cpp/build.sh @@ -23,15 +23,15 @@ TAR_FILE_NAME=aws-sdk-cpp-1.11.327.tar.gz SOURCE_CODE_PATH=aws-sdk-cpp-1.11.327 LOG_FILE=${LOCAL_DIR}/build_aws.log ROOT_DIR="${LOCAL_DIR}/../../" -CURL_LIB="${ROOT_DIR}/output/kernel/dependency/libcurl/comm/lib/libcurl.so" -CURL_INCLUDE="${ROOT_DIR}/output/kernel/dependency/libcurl/comm/include" -CRYPTO_LIB="${ROOT_DIR}/output/kernel/dependency/openssl/comm/lib/libcrypto.so" -CRYPTO_INCLUDE="${ROOT_DIR}/output/kernel/dependency/openssl/comm/include" -CRYPTO_STATIC="${ROOT_DIR}/output/kernel/dependency/openssl/comm/lib/libcrypto_static.a" +CURL_LIB="/usr/lib64/libcurl.so" +CURL_INCLUDE="/usr/include" +CRYPTO_LIB="/usr/lib64/libcrypto.so" +CRYPTO_INCLUDE="/usr/include" +CRYPTO_STATIC="/usr" ZLIB_DIR="${ROOT_DIR}/output/kernel/dependency/zlib1.2.11/comm" ZLIB_INCLUDE="${ROOT_DIR}/output/kernel/dependency/zlib1.2.11/comm/include" ZLIB_LIB="${ROOT_DIR}/output/kernel/dependency/zlib1.2.11/comm/lib/libz.so" -OPENSSL_DIR="${ROOT_DIR}/output/kernel/dependency/openssl/comm" +OPENSSL_DIR="/usr" INSTALL_COMPOENT_PATH_NAME="${ROOT_DIR}/output/kernel/dependency/aws-sdk-cpp" log() diff --git a/dependency/build/build_dependency.sh b/dependency/build/build_dependency.sh index c89f5c68a..87d69ed26 100644 --- a/dependency/build/build_dependency.sh +++ b/dependency/build/build_dependency.sh @@ -22,50 +22,50 @@ sh build.sh -m all >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[cJSON] is " $use_tm -echo ------------------------------jemalloc--------------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../jemalloc -if [ "$ARCH"x != "loongarch64"x ];then - python3 build.py -m all -t "release|debug" -f jemalloc-5.2.1.tar.gz >>../build/build_result.log -fi -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[jemalloc] is " $use_tm -echo ------------------------------libcgroup-------------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../libcgroup -python3 build.py -m all -t "comm|llt" -f libcgroup-2.0.tar.gz >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[libcgroup] is " $use_tm -echo ------------------------------numactl---------------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../numactl -python3 build.py -m all -t "comm|llt" -f numactl-2.0.16.tar.gz >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[numactl] is " $use_tm -echo ------------------------------unixodbc-------------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../unixodbc -sh build.sh -m all >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[unixodbc] is " $use_tm -echo ------------------------------fio-------------------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../fio -python3 build.py -m all -t comm -f fio-3.30.tar.gz >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[fio] is " $use_tm -echo ------------------------------iperf------------------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../iperf -python3 build.py -m all -t comm -f iperf-3.11.tar.gz >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[iperf] is " $use_tm +#echo ------------------------------jemalloc--------------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../jemalloc +#if [ "$ARCH"x != "loongarch64"x ];then +# python3 build.py -m all -t "release|debug" -f jemalloc-5.2.1.tar.gz >>../build/build_result.log +#fi +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[jemalloc] is " $use_tm +#echo ------------------------------libcgroup-------------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../libcgroup +#python3 build.py -m all -t "comm|llt" -f libcgroup-2.0.tar.gz >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[libcgroup] is " $use_tm +#echo ------------------------------numactl---------------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../numactl +#python3 build.py -m all -t "comm|llt" -f numactl-2.0.16.tar.gz >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[numactl] is " $use_tm +#echo ------------------------------unixodbc-------------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../unixodbc +#sh build.sh -m all >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[unixodbc] is " $use_tm +#echo ------------------------------fio-------------------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../fio +#python3 build.py -m all -t comm -f fio-3.30.tar.gz >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[fio] is " $use_tm +#echo ------------------------------iperf------------------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../iperf +#python3 build.py -m all -t comm -f iperf-3.11.tar.gz >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[iperf] is " $use_tm echo -------------------------------llvm------------------------------------------------------ start_tm=$(date +%s%N) cd $(pwd)/../llvm @@ -112,13 +112,13 @@ sh build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[cffi] $use_tm" -echo -------------------------------cryptography---------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../cryptography -sh build.sh >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[cryptography] $use_tm" +#echo -------------------------------cryptography---------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../cryptography +#sh build.sh >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[cryptography] $use_tm" #无依赖 echo ---------------------------------bcrypt-------------------------------------------------- @@ -149,13 +149,13 @@ sh build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[dmlc-core] $use_tm" -echo ---------------------------------libedit------------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../libedit -python3 build.py -m all -t "comm|llt" -f libedit-20210910-3.1.tar.gz >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[libedit] $use_tm" +#echo ---------------------------------libedit------------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../libedit +#python3 build.py -m all -t "comm|llt" -f libedit-20210910-3.1.tar.gz >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[libedit] $use_tm" echo ----------------------------------idna--------------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../idna @@ -163,13 +163,13 @@ sh build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[idna] $use_tm" -echo ----------------------------------nng------------------------------------------------ -start_tm=$(date +%s%N) -cd $(pwd)/../nng -python3 build.py -m all -t "comm" -f nng-1.5.2.tar.gz >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[nanomsg] $use_tm" +#echo ----------------------------------nng------------------------------------------------ +#start_tm=$(date +%s%N) +#cd $(pwd)/../nng +#python3 build.py -m all -t "comm" -f nng-1.5.2.tar.gz >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[nanomsg] $use_tm" echo ----------------------------------netifaces---------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../netifaces @@ -221,13 +221,13 @@ sh build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[pyOpenSSL] $use_tm" -echo -----------------------------------------lz4--------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../lz4 -sh build.sh -m all >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[lz4] $use_tm" +#echo -----------------------------------------lz4--------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../lz4 +#sh build.sh -m all >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[lz4] $use_tm" echo -----------------------------------------zlib-------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../zlib @@ -249,13 +249,13 @@ echo "[boost] $use_tm" # end_tm=$(date +%s%N) # use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") # echo "[brotli] $use_tm" -echo -----------------------------------------zstd-------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../zstd -sh build.sh >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[zstd] $use_tm" +#echo -----------------------------------------zstd-------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../zstd +#sh build.sh >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[zstd] $use_tm" echo --------------------------------------kerberos------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../kerberos @@ -263,13 +263,13 @@ python3 build.py -m all -t "comm|llt" -f krb5-1.18.3-final.tar.gz >>../build/bui end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[kerberos] $use_tm" -echo ---------------------------------------libcurl------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../libcurl -sh build.sh >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[libcurl] $use_tm" +#echo ---------------------------------------libcurl------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../libcurl +#sh build.sh >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[libcurl] $use_tm" echo --------------------------------------libiconv------------------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../libiconv @@ -277,13 +277,13 @@ sh build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[libiconv] $use_tm" -echo ---------------------------------------libxml2------------------------------------------ -start_tm=$(date +%s%N) -cd $(pwd)/../libxml2 -sh build.sh -m all >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[libxml2] $use_tm" +#echo ---------------------------------------libxml2------------------------------------------ +#start_tm=$(date +%s%N) +#cd $(pwd)/../libxml2 +#sh build.sh -m all >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[libxml2] $use_tm" echo ---------------------------------------nghttp2------------------------------------------ start_tm=$(date +%s%N) cd $(pwd)/../nghttp2 @@ -298,23 +298,23 @@ sh build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[pcre] $use_tm" -echo ---------------------------------------esdk_obs_api-------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../esdk_obs_api -sh build.sh >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[esdk_obs_api] $use_tm" - -echo ---------------------------------------pljava----------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../../dependency/pljava -if [[ "$ARCH"x != "loongarch64"x ]];then - bash build.sh -m build >>../build/build_result.log -fi -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[pljava] $use_tm" +#echo ---------------------------------------esdk_obs_api-------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../esdk_obs_api +#sh build.sh >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[esdk_obs_api] $use_tm" +# +#echo ---------------------------------------pljava----------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../../dependency/pljava +#if [[ "$ARCH"x != "loongarch64"x ]];then +# bash build.sh -m build >>../build/build_result.log +#fi +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[pljava] $use_tm" echo ---------------------------------------sqlparse----------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../sqlparse @@ -354,13 +354,13 @@ use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs echo "[aws-sdk-cpp] $use_tm" # only copy -echo ----------------------------------------etcd------------------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../etcd -sh build.sh >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[etcd] $use_tm" +#echo ----------------------------------------etcd------------------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../etcd +#sh build.sh >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[etcd] $use_tm" echo ---------------------------------------oracle_fdw----------------------------------- start_tm=$(date +%s%N) cd $(pwd)/../oracle_fdw @@ -375,10 +375,10 @@ sh build.sh >>../build/build_result.log end_tm=$(date +%s%N) use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") echo "[mysql_fdw] $use_tm" -echo ---------------------------------------memcheck----------------------------------- -start_tm=$(date +%s%N) -cd $(pwd)/../memcheck -sh build.sh >>../build/build_result.log -end_tm=$(date +%s%N) -use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") -echo "[memcheck] $use_tm" \ No newline at end of file +#echo ---------------------------------------memcheck----------------------------------- +#start_tm=$(date +%s%N) +#cd $(pwd)/../memcheck +#sh build.sh >>../build/build_result.log +#end_tm=$(date +%s%N) +#use_tm=$(echo $end_tm $start_tm | awk '{ print ($1 - $2) / 1000000000}' | xargs printf "%.2f") +#echo "[memcheck] $use_tm" \ No newline at end of file diff --git a/dependency/cryptography/build.sh b/dependency/cryptography/build.sh index 0881370c4..f55a1f2fc 100644 --- a/dependency/cryptography/build.sh +++ b/dependency/cryptography/build.sh @@ -6,9 +6,9 @@ mkdir -p $(pwd)/../python-lib mkdir -p $(pwd)/../../output/install_tools python_version=`python3 -V | awk -F ' ' '{print $2}' |awk -F '.' -v OFS='.' '{print $1,$2}'` export TARGET_PATH=$(pwd)/../../output/install_tools/ -export OPENSSL_ROOT_DIR=$(pwd)/../../output/kernel/dependency/openssl/comm +export OPENSSL_ROOT_DIR=/usr export LD_LIBRARY_PATH=$TARGET_PATH:$LD_LIBRARY_PATH -export LIBRARY_PATH=${OPENSSL_ROOT_DIR}/lib:$LIBRARY_PATH +export LIBRARY_PATH=${OPENSSL_ROOT_DIR}/lib64:$LIBRARY_PATH export C_INCLUDE_PATH=$C_INCLUDE_PATH:$OPENSSL_ROOT_DIR/include TAR_SOURCE_FILE=cryptography-3.3.2.tar.gz SOURCE_FILE=cryptography-3.3.2 @@ -30,7 +30,7 @@ done tar -zxf $TAR_SOURCE_FILE -C $SOURCE_FILE --strip-components 1 cd $SOURCE_FILE patch -p1 < ../CVE-2023-49083.patch -CFLAGS='-fstack-protector-all' LDFLAGS='-Wl,-z,relro,-z,now -z,noexecstack' python3 setup.py build_ext --inplace --library-dirs=${OPENSSL_ROOT_DIR}/lib --include-dirs=${OPENSSL_ROOT_DIR}/include +CFLAGS='-fstack-protector-all' LDFLAGS='-Wl,-z,relro,-z,now -z,noexecstack' python3 setup.py build_ext --inplace --library-dirs=${OPENSSL_ROOT_DIR}/lib64 --include-dirs=${OPENSSL_ROOT_DIR}/include python3 setup.py install --user diff --git a/dependency/grpc/build_common.sh b/dependency/grpc/build_common.sh index 13822f4fd..bba4325bc 100644 --- a/dependency/grpc/build_common.sh +++ b/dependency/grpc/build_common.sh @@ -24,7 +24,7 @@ TO_3RD=$LOCAL_DIR/build export PATH=$(pwd)/../../output/dependency/euleros2.0_sp5_x86_64/protobuf/comm/bin:$PATH MAIN=$LOCAL_DIR/../.. platform=$(sh ../../build/get_PlatForm_str.sh) -OPENSSL_ROOT=$LOCAL_DIR/../openssl/install/comm +OPENSSL_ROOT=/usr PROTOBUF_ROOT=$LOCAL_DIR/../protobuf/install_comm rm -rf grpc-1.28.1 pkgconfig mkdir pkgconfig @@ -53,7 +53,7 @@ cp -r ${LOCAL_DIR}/../protobuf/install_comm/lib/* ../../build/lib/ cp -r ${LOCAL_DIR}/../protobuf/install_comm/include/* ../../build/include/ cp -r ${LOCAL_DIR}/../c-ares/install_comm/lib/* ../../build/lib/ cp -r ${LOCAL_DIR}/../c-ares/install_comm/include/* ../../build/include/ -cp -r ${LOCAL_DIR}/../openssl/install/comm/lib/* ../../build/lib/ -cp -r ${LOCAL_DIR}/../openssl/install/comm/include/* ../../build/include/ +#cp -r ${LOCAL_DIR}/../openssl/install/comm/lib/* ../../build/lib/ +#cp -r ${LOCAL_DIR}/../openssl/install/comm/include/* ../../build/include/ cp -r ${MAIN}/output/dependency/$platform/zlib1.2.11/comm/lib/* ../../build/lib/ cp -r ${MAIN}/output/dependency/$platform/zlib1.2.11/comm/include/* ../../build/include/ diff --git a/dependency/kerberos/build.py b/dependency/kerberos/build.py index 60f74f025..25b65fc0e 100644 --- a/dependency/kerberos/build.py +++ b/dependency/kerberos/build.py @@ -138,8 +138,8 @@ class OPOperator(): prepare_cmd = 'mkdir -p %s/install/comm' % (self.local_dir) ret = self.exe_cmd(prepare_cmd) self.error_handler(ret) - openssl_comm_lib = (openssl_path % ("comm", "lib")) - openssl_comm_include = (openssl_path % ("comm", "include")) + openssl_comm_lib = "/usr/lib64" + openssl_comm_include = "/usr/include" config_cmd = "cd %s/%s/src; ./configure --prefix=%s/install/comm LDFLAGS='-Wl,-z,relro,-z,now -L%s' CFLAGS='-fstack-protector-strong -fPIC -I%s' --disable-rpath --disable-pkinit --with-system-verto=no" % (self.local_dir, source_code_path, self.local_dir, openssl_comm_lib, openssl_comm_include) print(config_cmd) ret = self.exe_cmd(config_cmd) @@ -151,8 +151,8 @@ class OPOperator(): prepare_cmd = 'mkdir -p %s/install/llt' % (self.local_dir) ret = self.exe_cmd(prepare_cmd) self.error_handler(ret) - openssl_llt_lib = (openssl_path % ("llt", "lib")) - openssl_llt_include = (openssl_path % ("llt", "include")) + openssl_llt_lib = "/usr/lib64" + openssl_llt_include = "/usr/include" config_cmd = "cd %s/%s/src; ./configure --prefix=%s/install/llt LDFLAGS='-Wl,-z,relro,-z,now -L%s' CFLAGS='-fstack-protector-strong -fPIC -I%s' --disable-rpath --disable-pkinit --with-system-verto=no" % (self.local_dir, source_code_path, self.local_dir, openssl_llt_lib, openssl_llt_include) print(config_cmd) ret = self.exe_cmd(config_cmd) diff --git a/dependency/libevent/build.sh b/dependency/libevent/build.sh index f51a70e19..ee3c1791f 100644 --- a/dependency/libevent/build.sh +++ b/dependency/libevent/build.sh @@ -23,8 +23,8 @@ TAR_FILE_NAME=libevent-2.1.12-stable.tar.gz SOURCE_CODE_PATH=libevent-2.1.12-stable LOG_FILE=${LOCAL_DIR}/build_event.log ROOT_DIR="${LOCAL_DIR}/../../" -SSL_LIB="${ROOT_DIR}/output/kernel/dependency/openssl/comm/lib" -SSL_INCLUDE="${ROOT_DIR}/output/kernel/dependency/openssl/comm/include" +SSL_LIB="/usr/lib64" +SSL_INCLUDE="/usr/include" INSTALL_COMPOENT_PATH_NAME="${ROOT_DIR}/output/kernel/dependency/event" log() diff --git a/dependency/masstree/build.sh b/dependency/masstree/build.sh index 245937775..a7257ba1c 100644 --- a/dependency/masstree/build.sh +++ b/dependency/masstree/build.sh @@ -25,6 +25,10 @@ tar -zxf $MASSTREE_PACKAGE -C $MASSTREE_MEGRED_SOURCES_DIR --strip-components 1 cd $MASSTREE_MEGRED_SOURCES_DIR patch -p1 < ../0001-Masstree-v1.0.1-MOT.patch +OS_VERSION=$(cat /etc/os-release | grep ^VERSION_ID= | cut -d'=' -f2 | tr -d '"') +if [ "$OS_VERSION" == "24.03" ]; then + patch -p1 < ../string_base.patch +fi sed -i "s/LDFLAGS =/LDFLAGS = -fstack-protector-all -z,now/g" Makefile sed -i "s/\$(CXX) -shared/\$(CXX) -fstack-protector-all -Wl,-z,relro,-z,now -shared/g" Makefile diff --git a/dependency/masstree/string_base.patch b/dependency/masstree/string_base.patch new file mode 100644 index 000000000..e4fb967ea --- /dev/null +++ b/dependency/masstree/string_base.patch @@ -0,0 +1,12 @@ +--- masstree-beta/string_base.hh.bak 2025-04-07 16:56:27.388340986 +0800 ++++ masstree-beta/string_base.hh 2025-04-07 16:57:21.816719803 +0800 +@@ -514,8 +514,7 @@ + + #if HAVE_STD_HASH + # define LCDF_MAKE_STRING_HASH(type) \ +- namespace std { template <> struct hash \ +- : public unary_function { \ ++ namespace std { template <> struct hash { \ + size_t operator()(const type& x) const noexcept { \ + return x.hashcode(); \ + } }; } diff --git a/dependency/nghttp2/build.sh b/dependency/nghttp2/build.sh index e16d21313..3f60f1ed3 100644 --- a/dependency/nghttp2/build.sh +++ b/dependency/nghttp2/build.sh @@ -27,7 +27,7 @@ cd $nghttp2_dir patch -p1 < ../cve-2023-35945.patch patch -p1 < ../CVE-2023-44487.patch patch -p1 < ../CVE-2024-28182.patch -cmake -DCMAKE_INSTALL_PREFIX=$build_dir -D CMAKE_PROJECT_INCLUDE=${current_dir}/project_include.cmake +cmake -DCMAKE_INSTALL_PREFIX=$build_dir -DCMAKE_PROJECT_INCLUDE=${current_dir}/project_include.cmake make install -sj -- Gitee