File tree 5 files changed +16
-11
lines changed
5 files changed +16
-11
lines changed Original file line number Diff line number Diff line change 17
17
# under the License.
18
18
#
19
19
20
- boost : 1.83.0
21
- cmake : 3.24.2
20
+ # Note: GCC 4.8 is incompatible with Boost >= 1.84 for the missed std::align
21
+ boost : 1.83.0
22
+ cmake : 3.28.3
22
23
protobuf : 3.20.0
23
- zlib : 1.2.12
24
- zstd : 1.5.2
25
- snappy : 1.1.9
26
- openssl : 1.1.1v
27
- curl : 8.4 .0
24
+ zlib : 1.3.1
25
+ zstd : 1.5.5
26
+ snappy : 1.1.10
27
+ openssl : 1.1.1w
28
+ curl : 8.6 .0
Original file line number Diff line number Diff line change @@ -104,7 +104,7 @@ RUN CURL_VERSION=$(dep-version.py curl) && \
104
104
curl -O -L https://github.com/curl/curl/releases/download/curl-${CURL_VERSION_UNDERSCORE}/curl-${CURL_VERSION}.tar.gz && \
105
105
tar xfz curl-${CURL_VERSION}.tar.gz && \
106
106
cd curl-${CURL_VERSION} && \
107
- CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd && \
107
+ CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd --without-libpsl && \
108
108
make -j8 && make install && \
109
109
rm -rf /curl-${CURL_VERSION}.tar.gz /curl-${CURL_VERSION}
110
110
Original file line number Diff line number Diff line change @@ -109,7 +109,7 @@ RUN CURL_VERSION=$(dep-version.py curl) && \
109
109
curl -O -L https://github.com/curl/curl/releases/download/curl-${CURL_VERSION_UNDERSCORE}/curl-${CURL_VERSION}.tar.gz && \
110
110
tar xfz curl-${CURL_VERSION}.tar.gz && \
111
111
cd curl-${CURL_VERSION} && \
112
- CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd && \
112
+ CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd --without-libpsl && \
113
113
make -j8 && make install && \
114
114
rm -rf /curl-${CURL_VERSION}.tar.gz /curl-${CURL_VERSION}
115
115
Original file line number Diff line number Diff line change @@ -140,6 +140,9 @@ if [ ! -f snappy-${SNAPPY_VERSION}/.done ]; then
140
140
curl -O -L https://github.com/google/snappy/archive/refs/tags/${SNAPPY_VERSION} .tar.gz
141
141
tar zxf ${SNAPPY_VERSION} .tar.gz
142
142
pushd snappy-${SNAPPY_VERSION}
143
+ # Without this patch, snappy 1.10 will report a sign-compare error, which cannot be suppressed with the -Wno-sign-compare option in CI
144
+ curl -O -L https://raw.githubusercontent.com/microsoft/vcpkg/2024.02.14/ports/snappy/no-werror.patch
145
+ patch < no-werror.patch
143
146
CXXFLAGS=" -fPIC -O3 -arch ${ARCH} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} " \
144
147
cmake . -DCMAKE_INSTALL_PREFIX=$PREFIX -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF
145
148
make -j16
@@ -167,6 +170,7 @@ if [ ! -f curl-${CURL_VERSION}/.done ]; then
167
170
--without-secure-transport \
168
171
--without-librtmp \
169
172
--disable-ipv6 \
173
+ --without-libpsl \
170
174
--host=$ARCH -apple-darwin \
171
175
--prefix=$PREFIX
172
176
make -j16 install
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ RUN BOOST_VERSION=$(dep-version.py boost) && \
46
46
tar zxf boost-${BOOST_VERSION}.tar.gz && \
47
47
cd boost-${BOOST_VERSION} && \
48
48
./bootstrap.sh --with-libraries=regex && \
49
- ./b2 address-model=64 cxxflags=-fPIC link=static threading=multi variant=release install && \
49
+ ./b2 address-model=64 cxxflags=" -fPIC -std=c++11" link=static threading=multi variant=release install && \
50
50
rm -rf /boost-${BOOST_VERSION}.tar.gz /boost-${BOOST_VERSION}
51
51
52
52
RUN CMAKE_VERSION=$(dep-version.py cmake) && \
@@ -110,7 +110,7 @@ RUN CURL_VERSION=$(dep-version.py curl) && \
110
110
curl -O -L https://github.com/curl/curl/releases/download/curl-${CURL_VERSION_UNDERSCORE}/curl-${CURL_VERSION}.tar.gz && \
111
111
tar xfz curl-${CURL_VERSION}.tar.gz && \
112
112
cd curl-${CURL_VERSION} && \
113
- CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd && \
113
+ CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ --without-zstd --without-libpsl && \
114
114
make -j8 && make install && \
115
115
rm -rf /curl-${CURL_VERSION}.tar.gz /curl-${CURL_VERSION}
116
116
You can’t perform that action at this time.
0 commit comments