Skip to content

Commit 57305df

Browse files
committed
Restored patch auditwheels.
1 parent 0821d40 commit 57305df

File tree

4 files changed

+22
-3
lines changed

4 files changed

+22
-3
lines changed

docker/manylinux2014/Dockerfile_aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ARG YASM_VERSION=1.3.0
1515
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
1616

1717
# epel-release need for aarch64 to get openblas packages
18-
RUN yum install curl-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel libXi-devel lapack-devel epel-release -y && \
18+
RUN yum install zlib-devel curl-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel libXi-devel lapack-devel epel-release -y && \
1919
yum install openblas-devel dejavu-sans-fonts -y && \
2020
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
2121
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \

docker/manylinux2014/Dockerfile_x86_64

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ ARG NASM_VERSION=2.15.04
1111
ARG OPENSSL_VERSION=1_1_1s
1212
ARG QT_VERSION=5.15.0
1313
ARG YASM_VERSION=1.3.0
14-
ARG ZLIB_VERSION=1.2.13
1514

1615
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
1716

1817
# epel-release need for aarch64 to get openblas packages
19-
RUN yum install curl-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel libXi-devel lapack-devel epel-release -y && \
18+
RUN yum install zlib-devel curl-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel libXi-devel lapack-devel epel-release -y && \
2019
yum install openblas-devel dejavu-sans-fonts -y && \
2120
cp /usr/include/lapacke/lapacke*.h /usr/include/ && \
2221
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h && \

patch_auditwheel_whitelist.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
from os.path import join, dirname, abspath
2+
import json
3+
4+
from auditwheel import policy
5+
6+
def add_whitelisted_libs():
7+
policies = None
8+
9+
with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json")) as f:
10+
policies = json.load(f)
11+
12+
for p in policies:
13+
p["lib_whitelist"].append("libxcb.so.1")
14+
15+
with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), "w") as f:
16+
f.write(json.dumps(policies))
17+
18+
if __name__ == '__main__':
19+
add_whitelisted_libs()

travis_config.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ function bdist_wheel_cmd {
2323
TOOLS_PATH=/opt/_internal/pipx/venvs/auditwheel
2424
/opt/python/cp39-cp39/bin/python -m venv $TOOLS_PATH
2525
source $TOOLS_PATH/bin/activate
26+
python patch_auditwheel_whitelist.py
2627
deactivate
2728
fi
2829
if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi

0 commit comments

Comments
 (0)