Skip to content

Commit 7e9299a

Browse files
authored
Merge pull request #324 from lkollar/manylinux1-libxcrypt
manylinux1: Install libxcrypt
2 parents ea03426 + c7b1c68 commit 7e9299a

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

docker/build_scripts/build.sh

+3
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ do_standard_install
113113
cd ..
114114
rm -rf $SQLITE_AUTOCONF_VERSION*
115115

116+
# Install libcrypt.so.2
117+
build_libxcrypt "$LIBXCRYPT_DOWNLOAD_URL" "$LIBXCRYPT_VERSION" "$LIBXCRYPT_HASH"
118+
116119
# Compile the latest Python releases.
117120
# (In order to have a proper SSL module, Python is compiled
118121
# against a recent openssl [see env vars above], which is linked

docker/build_scripts/build_env.sh

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ SQLITE_AUTOCONF_VERSION=sqlite-autoconf-3270200
3030
SQLITE_AUTOCONF_HASH=50c39e85ea28b5ecfdb3f9e860afe9ba606381e21836b2849efca6a0bfe6ef6e
3131
SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2019
3232

33+
LIBXCRYPT_VERSION=4.4.6
34+
LIBXCRYPT_DOWNLOAD_URL=https://codeload.github.com/besser82/libxcrypt/tar.gz
35+
LIBXCRYPT_HASH=4c33b80d3e1363c218ec6132bae0ea9eae181af9f9892939e90ec44b246ebe23
36+
3337
GIT_ROOT=2.21.0
3438
GIT_HASH=7a601275abcc6ff51cc79a6d402e83c90ae37d743b0b8d073aa009dd4b22d432
3539
GIT_DOWNLOAD_URL=https://github.com/git/git/archive

docker/build_scripts/build_utils.sh

+16-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ function build_curl {
200200

201201

202202
function do_standard_install {
203-
./configure > /dev/null
203+
./configure "$@" > /dev/null
204204
make > /dev/null
205205
make install > /dev/null
206206
}
@@ -246,3 +246,18 @@ function build_libtool {
246246
(cd ${libtool_fname} && do_standard_install)
247247
rm -rf ${libtool_fname} ${libtool_fname}.tar.gz
248248
}
249+
250+
function build_libxcrypt {
251+
curl -fsSLO "$LIBXCRYPT_DOWNLOAD_URL"/v"$LIBXCRYPT_VERSION"
252+
check_sha256sum "v$LIBXCRYPT_VERSION" "$LIBXCRYPT_HASH"
253+
tar xfz "v$LIBXCRYPT_VERSION"
254+
(cd "libxcrypt-$LIBXCRYPT_VERSION" && ./bootstrap && \
255+
do_standard_install \
256+
--disable-obsolete-api \
257+
--enable-hashes=all)
258+
259+
# Delete GLIBC version headers and libraries
260+
rm -rf /usr/include/crypt.h
261+
rm -rf /usr/lib/libcrypt.a /usr/lib/libcrypt.so
262+
rm -rf /usr/lib64/libcrypt.a /usr/lib64/libcrypt.so
263+
}

0 commit comments

Comments
 (0)