Skip to content

Commit c73b89d

Browse files
[Bot] Update dependencies (#1798)
* Bump git 2.49.0 → 2.50.0 * fix: git build on manylinux2014 --------- Co-authored-by: manylinux-bot[bot] <89297709+manylinux-bot[bot]@users.noreply.github.com> Co-authored-by: mayeut <[email protected]>
1 parent 04addcc commit c73b89d

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ RUN export CURL_ROOT=curl-8.14.1 && \
7878
export CURL_DOWNLOAD_URL=https://curl.haxx.se/download && \
7979
manylinux-entrypoint /build_scripts/build-curl.sh
8080
COPY build_scripts/build-git.sh /build_scripts/
81-
RUN export GIT_ROOT=git-2.49.0 && \
82-
export GIT_HASH=f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c && \
81+
RUN export GIT_ROOT=git-2.50.0 && \
82+
export GIT_HASH=920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da && \
8383
export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \
8484
manylinux-entrypoint /build_scripts/build-git.sh
8585

docker/build_scripts/build-git.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ fi
1717

1818
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
1919
export NO_UNCOMPRESS2=1
20+
CSPRNG_METHOD=urandom
21+
# workaround build issue when openssl gets included
22+
# git provides its own implementation of ctypes which conflicts
23+
# with the one in CentOS 7. Just use the one from git.
24+
echo "" > /usr/include/ctype.h
25+
else
26+
CSPRNG_METHOD=getrandom
2027
fi
2128

2229
if [ -d /opt/_internal ]; then
@@ -37,7 +44,7 @@ fetch_source "${GIT_ROOT}.tar.gz" "${GIT_DOWNLOAD_URL}"
3744
check_sha256sum "${GIT_ROOT}.tar.gz" "${GIT_HASH}"
3845
tar -xzf "${GIT_ROOT}.tar.gz"
3946
pushd "${GIT_ROOT}"
40-
make install prefix=/usr/local NO_GETTEXT=1 NO_TCLTK=1 DESTDIR=/manylinux-rootfs CPPFLAGS="${MANYLINUX_CPPFLAGS}" CFLAGS="${MANYLINUX_CFLAGS}" CXXFLAGS="${MANYLINUX_CXXFLAGS}" LDFLAGS="${MANYLINUX_LDFLAGS}"
47+
make install prefix=/usr/local NO_GETTEXT=1 NO_TCLTK=1 DESTDIR=/manylinux-rootfs CSPRNG_METHOD=${CSPRNG_METHOD} CPPFLAGS="${MANYLINUX_CPPFLAGS}" CFLAGS="${MANYLINUX_CFLAGS}" CXXFLAGS="${MANYLINUX_CXXFLAGS}" LDFLAGS="${MANYLINUX_LDFLAGS}"
4148
popd
4249
rm -rf "${GIT_ROOT}" "${GIT_ROOT}.tar.gz"
4350

0 commit comments

Comments
 (0)