File tree Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -78,8 +78,8 @@ RUN export CURL_ROOT=curl-8.14.1 && \
78
78
export CURL_DOWNLOAD_URL=https://curl.haxx.se/download && \
79
79
manylinux-entrypoint /build_scripts/build-curl.sh
80
80
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 && \
83
83
export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \
84
84
manylinux-entrypoint /build_scripts/build-git.sh
85
85
Original file line number Diff line number Diff line change 17
17
18
18
if [ " ${AUDITWHEEL_POLICY} " == " manylinux2014" ]; then
19
19
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
20
27
fi
21
28
22
29
if [ -d /opt/_internal ]; then
@@ -37,7 +44,7 @@ fetch_source "${GIT_ROOT}.tar.gz" "${GIT_DOWNLOAD_URL}"
37
44
check_sha256sum " ${GIT_ROOT} .tar.gz" " ${GIT_HASH} "
38
45
tar -xzf " ${GIT_ROOT} .tar.gz"
39
46
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} "
41
48
popd
42
49
rm -rf " ${GIT_ROOT} " " ${GIT_ROOT} .tar.gz"
43
50
You can’t perform that action at this time.
0 commit comments