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

Use forked version of auditwheel with correct rpath patching #16777

Merged
merged 1 commit into from
Feb 2, 2024
Merged

Use forked version of auditwheel with correct rpath patching #16777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .builders/images/runner_dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
python-dotenv==1.0.0
urllib3==2.2.0
auditwheel==5.4.0; sys_platform == 'linux'
auditwheel @ git+https://github.com/DataDog/auditwheel.git@64f212de1791858c21657763385b3879f93cdb04; sys_platform == 'linux'
delvewheel==1.5.2; sys_platform == 'win32'
delocate==0.10.7; sys_platform == 'darwin'
10 changes: 6 additions & 4 deletions .builders/scripts/repair_wheels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,22 @@ def wheel_was_built(wheel: Path) -> bool:

def repair_linux(source_dir: str, built_dir: str, external_dir: str) -> None:
from auditwheel.patcher import Patchelf
from auditwheel.policy import get_policy_by_name
from auditwheel.policy import WheelPolicies
from auditwheel.repair import repair_wheel
from auditwheel.wheel_abi import NonPlatformWheel

exclusions = [
exclusions = frozenset({
# pymqi
'libmqic_r.so',
# confluent_kafka
# We leave cyrus-sasl out of the wheel because of the complexity involved in bundling it portably.
# This means the confluent-kafka wheel will have a runtime dependency on this library
'libsasl2.so.3',
]
})

# Hardcoded policy to the minimum we need to currently support
policy = get_policy_by_name('manylinux2010_x86_64')
policies = WheelPolicies()
policy = policies.get_policy_by_name('manylinux2010_x86_64')
abis = [policy['name'], *policy['aliases']]

for wheel in iter_wheels(source_dir):
Expand All @@ -86,6 +87,7 @@ def repair_linux(source_dir: str, built_dir: str, external_dir: str) -> None:

try:
repair_wheel(
policies,
str(wheel),
abis=abis,
lib_sdir='.libs',
Expand Down
Loading