Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use manylinux2014 base image instead #62

Merged
merged 20 commits into from
Apr 18, 2024
Merged

Use manylinux2014 base image instead #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d48e0bf
Use `manylinux2014` base image instead
kazarmy Apr 18, 2024
7d1aabd
Add CentOS 7 llvm-toolset-7.0 install
kazarmy Apr 18, 2024
198ccef
Use `yum -y`
kazarmy Apr 18, 2024
7fec770
Use `source scl_source` instead
kazarmy Apr 18, 2024
ba3fcc4
Use `|| true`
kazarmy Apr 18, 2024
7528eca
Add some test statements
kazarmy Apr 18, 2024
68b1feb
Try using `ln -s`
kazarmy Apr 18, 2024
febb273
Do `ln -s` for llvm-config as well
kazarmy Apr 18, 2024
99baba7
Try installing `llvm-toolset-7.0-llvm-devel`
kazarmy Apr 18, 2024
ccd98bd
Use a `before-build` command
kazarmy Apr 18, 2024
11d9ba1
Use `before-build-linux` and remove symbolic links
kazarmy Apr 18, 2024
91024d5
Use `tool.cibuildwheel.linux`
kazarmy Apr 18, 2024
1e43902
Set PATH manually
kazarmy Apr 18, 2024
235a507
Remove `before-build` and set LD_LIBRARY_PATH manually
kazarmy Apr 18, 2024
33743de
Put env vars on 1 line
kazarmy Apr 18, 2024
b6b291f
Remove Python path from PATH
kazarmy Apr 18, 2024
3661748
Try not installing centos-release-scl
kazarmy Apr 18, 2024
c69fe0c
Drop i686 support
kazarmy Apr 18, 2024
7cd30a7
Keep only llvm-toolset-7.0 paths
kazarmy Apr 18, 2024
bc2fb95
Cleanup
kazarmy Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cibw_before_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ if command -v apt; then
apt update && apt install --assume-yes libclang-7-dev clang-7 llvm-7
elif command -v apk; then
apk update && apk add clang-dev
elif command -v yum; then
yum -y install llvm-toolset-7.0 llvm-toolset-7.0-llvm-devel
# (CentOS 7) Uncomment following lines to see required paths in build log:
# yum -y install centos-release-scl
# source scl_source enable llvm-toolset-7.0 || true
fi

pushd rizin
Expand Down
7 changes: 5 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ setup = ['-Dwheel=true']
[tool.cibuildwheel]
build-verbosity = 3
before-all = "bash {project}/cibw_before_all.sh"
manylinux-x86_64-image = "manylinux_2_24"
manylinux-i686-image = "manylinux_2_24"
manylinux-x86_64-image = "manylinux2014"
skip = "pp*"

[tool.cibuildwheel.linux]
environment = { PATH="/opt/rh/llvm-toolset-7.0/root/usr/bin:/opt/rh/llvm-toolset-7.0/root/usr/sbin:$PATH", LD_LIBRARY_PATH="/opt/rh/llvm-toolset-7.0/root/usr/lib64:$LD_LIBRARY_PATH" }
archs = ["x86_64"]

[tool.cibuildwheel.windows]
environment = { CMAKE_PREFIX_PATH="C:\\rizin" }
archs = ["AMD64"]
Expand Down
Loading