Skip to content

Commit caba29c

Browse files
committed
Only install libxcrypt on manylinux2014
1 parent 3e7a3c3 commit caba29c

File tree

2 files changed

+2
-32
lines changed

2 files changed

+2
-32
lines changed

docker/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ COPY build_scripts/install-libxcrypt.sh /build_scripts/
6464
RUN export LIBXCRYPT_VERSION=4.4.36 && \
6565
export LIBXCRYPT_HASH=b979838d5f1f238869d467484793b72b8bca64c4eae696fdbba0a9e0b6c28453 && \
6666
export LIBXCRYPT_DOWNLOAD_URL=https://github.com/besser82/libxcrypt/archive && \
67-
export PERL_ROOT=perl-5.34.0 && \
68-
export PERL_HASH=551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a && \
69-
export PERL_DOWNLOAD_URL=https://www.cpan.org/src/5.0 && \
7067
manylinux-entrypoint /build_scripts/install-libxcrypt.sh
7168

7269
FROM runtime_base AS build_base

docker/build_scripts/install-libxcrypt.sh

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,11 @@ MY_DIR=$(dirname "${BASH_SOURCE[0]}")
1010
# Get build utilities
1111
source $MY_DIR/build_utils.sh
1212

13-
if [ "$BASE_POLICY" == "musllinux" ]; then
14-
echo "Skip libxcrypt installation on musllinux"
15-
exit 0
16-
elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
17-
echo "Skip libxcrypt installation on manylinux_2_28"
13+
if [ "${AUDITWHEEL_POLICY}" != "manylinux2014" ]; then
14+
echo "Skip libxcrypt installation on ${AUDITWHEEL_POLICY}"
1815
exit 0
1916
fi
2017

21-
# We need perl 5.14+
22-
if ! perl -e 'use 5.14.0' &> /dev/null; then
23-
check_var ${PERL_ROOT}
24-
check_var ${PERL_HASH}
25-
check_var ${PERL_DOWNLOAD_URL}
26-
fetch_source ${PERL_ROOT}.tar.gz ${PERL_DOWNLOAD_URL}
27-
check_sha256sum "${PERL_ROOT}.tar.gz" "${PERL_HASH}"
28-
29-
tar -xzf ${PERL_ROOT}.tar.gz
30-
pushd ${PERL_ROOT}
31-
./Configure -des -Dprefix=/tmp/perl-libxcrypt > /dev/null
32-
make -j$(nproc) > /dev/null
33-
make install > /dev/null
34-
popd
35-
36-
rm -rf ${PERL_ROOT}.tar.gz ${PERL_ROOT}
37-
export PATH=/tmp/perl-libxcrypt/bin:${PATH}
38-
fi
39-
4018
# Install libcrypt.so.1 and libcrypt.so.2
4119
check_var ${LIBXCRYPT_VERSION}
4220
check_var ${LIBXCRYPT_HASH}
@@ -77,8 +55,3 @@ rm -rf /manylinux-rootfs
7755
rm -rf /usr/include/crypt.h
7856
find /lib* /usr/lib* \( -name 'libcrypt.a' -o -name 'libcrypt.so' -o -name 'libcrypt.so.*' -o -name 'libcrypt-2.*.so' \) -delete
7957
ldconfig
80-
81-
# Remove temp Perl
82-
if [ -d /tmp/perl-libxcrypt ]; then
83-
rm -rf /tmp/perl-libxcrypt
84-
fi

0 commit comments

Comments
 (0)