diff --git a/OpenSource.yml b/OpenSource.yml index d1fcd9262c5f295b5768a0a5e872558bbdb68834..f00aa2777f0a8352c9f7956ac2f9676a9d02f4b5 100644 --- a/OpenSource.yml +++ b/OpenSource.yml @@ -34,7 +34,7 @@ opengauss: name: "bottle" pkg_name: "bottle-0.12.17.tar.gz" down_load_type: "wget" - sha256: "7df26ca1789aa0693277c4a86d564524bff03e5d3132d9405946c58739190928" + sha256: "9638e15337dfb37f7eee1010851b88bf1d8b292115924754f3f46a4934db6cc5" - github: repo: "https://github.com/cffi/cffi.git" branch: "1.15.0" @@ -254,13 +254,13 @@ opengauss: sha256: "f4a9be08d22f5ad9b4bf36c491f1be58e54dc35a1592eaf4e3f79567e4894d0c" - github: repo: "https://github.com/numactl/numactl.git" - url: "https://github.com/numactl/numactl/releases/download/v2.0.14/numactl-2.0.14.tar.gz" - branch: "v2.0.14" + url: "https://github.com/numactl/numactl/releases/download/v2.0.16/numactl-2.0.16.tar.gz" + branch: "v2.0.16" path: "dependency/numactl" name: "numactl" - pkg_name: "numactl-2.0.14.tar.gz" + pkg_name: "numactl-2.0.16.tar.gz" down_load_type: "wget" - sha256: "826bd148c1b6231e1284e42a4db510207747484b112aee25ed6b1078756bcff6" + sha256: "1b242f893af977a1d31af6ce9d6b8dafdd2d8ec3dc9207f7c2dc0d3446e7c7c8" - gitee: repo: "https://gitee.com/src-openeuler/openssl.git" url: "https://gitee.com/src-openeuler/openssl/repository/archive/openEuler-22.03-LTS-SP2.tar.gz" diff --git a/Third_Party_Open_Source_Software_List.yaml b/Third_Party_Open_Source_Software_List.yaml index 3ec1feba134da0312196c967fc5edb8270fe0172..40d364a1e78d1fe452bbf308d859434f2018ac9e 100644 --- a/Third_Party_Open_Source_Software_List.yaml +++ b/Third_Party_Open_Source_Software_List.yaml @@ -108,7 +108,7 @@ zlib: url: 'https://github.com/madler/zlib' numactl: cpeName: numactl - version: 2.0.14 + version: 2.0.16 url: 'https://github.com/numactl/numactl' pyOpenSSL: cpeName: pyOpenSSL diff --git a/Third_Party_Open_Source_Software_Notice b/Third_Party_Open_Source_Software_Notice index f20e86cffe296b88cd48c603c3fd63688e862cd1..21837ca7b038c9daddf0803638d23737ad31b8a8 100644 --- a/Third_Party_Open_Source_Software_Notice +++ b/Third_Party_Open_Source_Software_Notice @@ -6236,7 +6236,7 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. -Software: numactl 2.0.14 +Software: numactl 2.0.16 Copyright notice£ºCopyright (C) 2010 Intel Corporation Copyright (C) 2005 Andi Kleen, SuSE Labs. Copyright (C) 2003,2004,2005,2008 Andi Kleen,SuSE Labs andCliff Wickman,SGI. diff --git a/dependency/bcrypt/build.sh b/dependency/bcrypt/build.sh index 46654fcfd0009285ed62cff6b13a212c7f9c2fad..432a845731d151d3cc0cfa0fd93e0f92717dc10a 100644 --- a/dependency/bcrypt/build.sh +++ b/dependency/bcrypt/build.sh @@ -23,7 +23,7 @@ tar -zxf $TAR_SOURCE_FILE -C $SOURCE_FILE --strip-components 1 cd $SOURCE_FILE CFLAGS='-fstack-protector-all' LDFLAGS='-Wl,-z,relro,-z,now -z,noexecstack' python3 setup.py build -version_num=("3.6" "3.7" "3.8" "3.9" "3.10") +version_num=("3.6" "3.7" "3.8" "3.9" "3.10" "3.11") lib_dir="" for (( i=0;i<${#version_num[*]};i++ )) do diff --git a/dependency/boost/build_component.sh b/dependency/boost/build_component.sh index ca5aacccce09b73d72ff94d44d2be3d1df3b87cd..827c240d8247c679e325a3e3a5545baa7ce00239 100644 --- a/dependency/boost/build_component.sh +++ b/dependency/boost/build_component.sh @@ -23,7 +23,12 @@ function build_component() fi # Compatible with python3 compilation - sed -i "s/include\/python\$(version)/include\/python\$(version)m/g" tools/build/src/tools/python.jam + python_version=`python3 -V | awk -F ' ' '{print $2}' |awk -F '.' -v OFS='.' '{print $1,$2}'` + if [ "$python_version" == "3.11" ]; then + sed -i "s/include\/python\$(version)/include\/python\$(version)/g" tools/build/src/tools/python.jam + else + sed -i "s/include\/python\$(version)/include\/python\$(version)m/g" tools/build/src/tools/python.jam + fi chmod +x bootstrap.sh chmod +x ./tools/build/src/engine/build.sh diff --git a/dependency/bottle/bottle-0.12.17.tar.gz b/dependency/bottle/bottle-0.12.17.tar.gz index cb0be8e5f3d76f86618d45533b80e2953e2347e3..dae5df793f1cd0e2f050f5130ec7a39050b00f96 100644 Binary files a/dependency/bottle/bottle-0.12.17.tar.gz and b/dependency/bottle/bottle-0.12.17.tar.gz differ diff --git a/dependency/build/build_dependency.sh b/dependency/build/build_dependency.sh index 8c183309d1e8f9d5b1c1385d7e204294e9300cfc..c89f5c68add14557191cb10de042aeec9932cfe0 100644 --- a/dependency/build/build_dependency.sh +++ b/dependency/build/build_dependency.sh @@ -41,7 +41,7 @@ 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.14.tar.gz >>../build/build_result.log +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 diff --git a/dependency/cffi/build.sh b/dependency/cffi/build.sh index 8799a23eb0bdc212a325feb876e14507f959dcec..e72323268395c10b61dfb038a2ca4fc65dc33f6b 100644 --- a/dependency/cffi/build.sh +++ b/dependency/cffi/build.sh @@ -8,7 +8,7 @@ export LD_LIBRARY_PATH=$TARGET_PATH:$LD_LIBRARY_PATH:/usr/lib64 export PATH=$TARGET_PATH:$PATH export PYTHONPATH=$TARGET_PATH:$LIBRARY_PATH -version_list=("3.6" "3.7" "3.8" "3.9" "3.10") +version_list=("3.6" "3.7" "3.8" "3.9" "3.10" "3.11") python_version=`python3 -V | awk -F ' ' '{print $2}' | awk -F '.' -v OFS='.' '{print $1,$2}'` TAR_SOURCE_FILE=cffi-1.15.0.tar.gz diff --git a/dependency/cryptography/build.sh b/dependency/cryptography/build.sh index d0441ff71e3fb80a52fa44e6d28aa8cec4c60bf4..0881370c42b94d32aeb4f37f333051a925876251 100644 --- a/dependency/cryptography/build.sh +++ b/dependency/cryptography/build.sh @@ -17,7 +17,7 @@ if [ -d ${SOURCE_FILE} ]; then fi mkdir ${SOURCE_FILE} -version_num=("3.6" "3.7" "3.8" "3.9" "3.10") +version_num=("3.6" "3.7" "3.8" "3.9" "3.10" "3.11") lib_dir="" for (( i=0;i<${#version_num[*]};i++ )) do diff --git a/dependency/numactl/numactl-2.0.14.tar.gz b/dependency/numactl/numactl-2.0.14.tar.gz deleted file mode 100644 index 17fe3d394343fdc123830174b7442cb92c40f506..0000000000000000000000000000000000000000 Binary files a/dependency/numactl/numactl-2.0.14.tar.gz and /dev/null differ diff --git a/dependency/numactl/numactl-2.0.16.tar.gz b/dependency/numactl/numactl-2.0.16.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ca1edaf7c0393a8e733fadf7486559231edf79ec Binary files /dev/null and b/dependency/numactl/numactl-2.0.16.tar.gz differ diff --git a/dependency/psutil/build.sh b/dependency/psutil/build.sh index 8fed73054bd746b8c90ac68096eceaf62094b05a..e7ee75667441a6ba6d531fdee2d82f1f249a3289 100644 --- a/dependency/psutil/build.sh +++ b/dependency/psutil/build.sh @@ -31,7 +31,7 @@ cp -r build/lib*/* $TARGET_PATH cp ../_psutil_linux.py $TARGET_PATH/psutil/ cp ../_psutil_posix.py $TARGET_PATH/psutil/ -version_num=("3.6" "3.7" "3.8" "3.9" "3.10") +version_num=("3.6" "3.7" "3.8" "3.9" "3.10" "3.11") for (( i=0;i<${#version_num[*]};i++ )) do if [[ $(python3 -V | awk '{print $2}') =~ ${version_num[$i]} ]]; then diff --git a/dependency/pynacl/build.sh b/dependency/pynacl/build.sh index ee97054b6271688bf874502f1221c879d3e6c37c..b8121b0a6cb69afafe25257c21db8756fb88f971 100644 --- a/dependency/pynacl/build.sh +++ b/dependency/pynacl/build.sh @@ -27,7 +27,7 @@ fi sed -i "s/\"wheel\"//g" setup.py CFLAGS="-fstack-protector-strong -Wl,-z,relro,-z,now" python3 setup.py build -version_num=("3.6" "3.7" "3.8" "3.9" "3.10") +version_num=("3.6" "3.7" "3.8" "3.9" "3.10" "3.11") lib_dir="" for (( i=0;i<${#version_num[*]};i++ )) do