Skip to content

Commit 44a0ec8

Browse files
committed
fix
1 parent da324c0 commit 44a0ec8

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

docker/build_scripts/install-build-packages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ source "${MY_DIR}/build_utils.sh"
1515
# make sure the corresponding library is added to RUNTIME_DEPS if applicable
1616

1717
if [ "${OS_ID_LIKE}" = "rhel" ]; then
18-
COMPILE_DEPS=(bzip2-devel ncurses-devel readline-devel gdbm-devel libpcap-devel xz-devel openssl openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel curl-devel uuid-devel libffi-devel kernel-headers libdb-devel perl-IPC-Cmd)
18+
COMPILE_DEPS=(bzip2-devel ncurses-devel readline-devel gdbm-devel libpcap-devel xz-devel openssl openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel curl-devel uuid-devel libffi-devel kernel-headers perl-IPC-Cmd)
1919
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
2020
COMPILE_DEPS+=(libidn-devel libXft-devel)
2121
elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
@@ -24,7 +24,7 @@ if [ "${OS_ID_LIKE}" = "rhel" ]; then
2424
COMPILE_DEPS+=(libidn2-devel tk-devel)
2525
fi
2626
elif [ "${OS_ID_LIKE}" == "debian" ]; then
27-
COMPILE_DEPS=(libbz2-dev libncurses-dev libreadline-dev tk-dev libgdbm-dev libdb-dev libpcap-dev liblzma-dev openssl libssl-dev libkeyutils-dev libkrb5-dev comerr-dev libidn2-0-dev libcurl4-openssl-dev uuid-dev libffi-dev linux-headers-generic)
27+
COMPILE_DEPS=(libbz2-dev libncurses-dev libreadline-dev tk-dev libgdbm-dev libpcap-dev liblzma-dev openssl libssl-dev libkeyutils-dev libkrb5-dev comerr-dev libidn2-0-dev libcurl4-openssl-dev uuid-dev libffi-dev linux-headers-generic)
2828
elif [ "${OS_ID_LIKE}" == "alpine" ]; then
2929
COMPILE_DEPS=(bzip2-dev ncurses-dev readline-dev tk-dev gdbm-dev libpcap-dev xz-dev openssl openssl-dev keyutils-dev krb5-dev libcom_err libidn-dev curl-dev util-linux-dev libffi-dev linux-headers)
3030
else

docker/build_scripts/install-runtime-packages.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fi
4646

4747
# RUNTIME_DEPS: Runtime dependencies. c.f. install-build-packages.sh
4848
if [ "${OS_ID_LIKE}" == "rhel" ]; then
49-
RUNTIME_DEPS=(zlib bzip2 expat ncurses readline gdbm libpcap xz openssl keyutils-libs libkadm5 libcom_err libcurl uuid libffi libdb)
49+
RUNTIME_DEPS=(zlib bzip2 expat ncurses readline gdbm libpcap xz openssl keyutils-libs libkadm5 libcom_err libcurl uuid libffi)
5050
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
5151
RUNTIME_DEPS+=(libidn libXft)
5252
elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
@@ -57,14 +57,14 @@ if [ "${OS_ID_LIKE}" == "rhel" ]; then
5757
RUNTIME_DEPS+=(libxcrypt-compat)
5858
fi
5959
elif [ "${OS_ID_LIKE}" == "debian" ]; then
60-
RUNTIME_DEPS=(zlib1g libbz2-1.0 libexpat1 libncurses6 libreadline8 tk libgdbm6 libdb5.3 libpcap0.8 liblzma5 libkeyutils1 libkrb5-3 libcom-err2 libidn2-0 libcurl4 uuid)
60+
RUNTIME_DEPS=(zlib1g libbz2-1.0 libexpat1 libncurses6 libreadline8 tk libgdbm6 libpcap0.8 liblzma5 libkeyutils1 libkrb5-3 libcom-err2 libidn2-0 libcurl4 uuid)
6161
if [ "${AUDITWHEEL_POLICY}" == "manylinux_2_31" ]; then
6262
RUNTIME_DEPS+=(libffi7 libssl1.1)
6363
else
6464
RUNTIME_DEPS+=(libffi8 libssl3)
6565
fi
6666
elif [ "${OS_ID_LIKE}" == "alpine" ]; then
67-
RUNTIME_DEPS=(zlib bzip2 expat ncurses-libs readline tk gdbm db xz openssl keyutils-libs krb5-libs libcom_err libidn2 libcurl libuuid libffi)
67+
RUNTIME_DEPS=(zlib bzip2 expat ncurses-libs readline tk gdbm xz openssl keyutils-libs krb5-libs libcom_err libidn2 libcurl libuuid libffi)
6868
else
6969
echo "Unsupported policy: '${AUDITWHEEL_POLICY}'"
7070
exit 1

docker/tests/run_tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ for PYTHON in /opt/python/*/bin/python; do
6565
$PYTHON -c 'import sqlite3; print(sqlite3.sqlite_version); assert sqlite3.sqlite_version_info[0:2] >= (3, 50)'
6666
# Make sure tkinter module can be loaded properly
6767
$PYTHON -c 'import tkinter; print(tkinter.TkVersion); assert tkinter.TkVersion >= 8.6'
68+
# check other modules
69+
$PYTHON -c 'import dbm.gnu; import dbm.ndbm; import readline; import curses; print(curses.ncurses_version)'
6870
# cpython shall be available as python
6971
LINK_VERSION=$("python${PYVERS}${PY_GIL}" -VV)
7072
REAL_VERSION=$(${PYTHON} -VV)

0 commit comments

Comments
 (0)