diff --git a/.github/workflows/build_steps.yml b/.github/workflows/build_steps.yml index 8e39400c37..bfaacea33e 100644 --- a/.github/workflows/build_steps.yml +++ b/.github/workflows/build_steps.yml @@ -164,6 +164,7 @@ jobs: run: pipx run cibuildwheel==${{inputs.cibw_version}} env: CIBW_MANYLINUX_X86_64_IMAGE: ${{inputs.cibw_image_tag}} + CIBW_REPAIR_WHEEL_COMMAND_LINUX: auditwheel repair -L . -w {dest_dir} {wheel} --exclude libssl.so.3 - name: Store wheel artifact if: inputs.job_type == 'build-python-wheels' diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json index 005e3b16be..29e2bac188 100644 --- a/cpp/CMakePresets.json +++ b/cpp/CMakePresets.json @@ -110,7 +110,11 @@ }, { "name": "linux-debug", - "inherits": ["common_vcpkg", "linux"] + "inherits": ["common_vcpkg", "linux"], + "cacheVariables": { + "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/third_party/vcpkg_overlays/triplets/", + "VCPKG_TARGET_TRIPLET": "x64-linux-mix" + } }, { "name": "linux-debug-clang", @@ -145,7 +149,15 @@ { "name": "windows-cl-release", "inherits": "windows-cl-debug", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" }}, { "name": "windows-cl-conda-release", "inherits": "windows-cl-conda-debug", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" } }, - { "name": "linux-release", "inherits": "linux-debug", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } }, + { + "name": "linux-release", + "inherits": "linux-debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/third_party/vcpkg_overlays/triplets/", + "VCPKG_TARGET_TRIPLET": "x64-linux-mix" + } + }, { "name": "linux-conda-release", "inherits": "linux-conda-debug", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } }, { "name": "darwin-conda-release", "inherits": "darwin-conda-debug", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } } ], diff --git a/cpp/third_party/vcpkg_overlays/triplets/x64-linux-mix.cmake b/cpp/third_party/vcpkg_overlays/triplets/x64-linux-mix.cmake new file mode 100644 index 0000000000..071f60aa88 --- /dev/null +++ b/cpp/third_party/vcpkg_overlays/triplets/x64-linux-mix.cmake @@ -0,0 +1,9 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_CMAKE_SYSTEM_NAME Linux) + +if(${PORT} MATCHES "openssl") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() \ No newline at end of file diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json index d532d8305b..c58f526f83 100644 --- a/cpp/vcpkg.json +++ b/cpp/vcpkg.json @@ -67,7 +67,6 @@ "benchmark" ], "overrides": [ - { "name": "openssl", "version-string": "1.1.1n#1" }, { "name": "aws-sdk-cpp", "version": "1.11.201" }, { "name": "aws-c-s3", "version": "0.3.24" }, { "name": "bitmagic", "version": "7.12.3" }, diff --git a/docs/mkdocs/docs/error_messages.md b/docs/mkdocs/docs/error_messages.md index 4ba610cbb4..122ec8a170 100644 --- a/docs/mkdocs/docs/error_messages.md +++ b/docs/mkdocs/docs/error_messages.md @@ -183,3 +183,8 @@ RuntimeError |-- StreamDescriptorMismatch └-- InternalException ``` + +## Import Error +| Error messages | Cause | Resolution | +|:--------------|:-------|:-----------| +| libssl.so.3: cannot open shared object file | For linux-pypi prebuilt binary, since v4.5.0, libssl is no longer statically linked | Install libssl v3 manually | \ No newline at end of file