-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patch auditwheel to fix libstem.so rpath issue
pypa/auditwheel#136 results in pure C++ libraries not getting patched by auditwheel. This is a problem for us, since our pure C++ library, libstem.so, needs its rpath patched for hdf5. pypa/auditwheel#283 fixes this issue, but is not yet merged. Until it gets merged and added to quay.io/pypa/manylinux2010_x86_64, we will patch auditwheel inside quay.io/pypa/manylinux2010_x86_64 to include this fix. Signed-off-by: Patrick Avery <patrick.avery@kitware.com>
- Loading branch information
Showing
4 changed files
with
36 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
diff --git a/auditwheel/wheel_abi.py b/auditwheel/wheel_abi.py | ||
index 69f83ce..7875f6e 100644 | ||
--- a/auditwheel/wheel_abi.py | ||
+++ b/auditwheel/wheel_abi.py | ||
@@ -118,10 +118,16 @@ def get_wheel_elfdata(wheel_fn: str): | ||
# we should walk its elftree. | ||
if basename(fn) not in needed_libs: | ||
full_elftree[fn] = nonpy_elftree[fn] | ||
- full_external_refs[fn] = lddtree_external_references( | ||
- nonpy_elftree[fn], ctx.path) | ||
|
||
- log.debug(json.dumps(full_elftree, indent=4)) | ||
+ # Even if a non-pyextension ELF file is not needed, we | ||
+ # should include it as an external references, because | ||
+ # they might also require external libraries. | ||
+ full_external_refs[fn] = lddtree_external_references( | ||
+ nonpy_elftree[fn], ctx.path) | ||
+ | ||
+ log.debug('full_elftree:\n%s', json.dumps(full_elftree, indent=4)) | ||
+ log.debug('full_external_refs (will be repaired):\n%s', | ||
+ json.dumps(full_external_refs, indent=4)) | ||
|
||
return (full_elftree, full_external_refs, versioned_symbols, | ||
uses_ucs2_symbols, uses_PyFPE_jbuf) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
#!/usr/bin/env bash | ||
|
||
image_base=quay.io/pypa/manylinux2010_x86_64 | ||
tag=openchemistry/stempy_manylinux2010_x86_64 | ||
tag=openchemistry/stempy_wheel_builder | ||
|
||
docker build . -t $tag --build-arg BASE_IMAGE=$image_base | ||
docker push $tag |