File tree Expand file tree Collapse file tree 3 files changed +21
-3
lines changed
Expand file tree Collapse file tree 3 files changed +21
-3
lines changed Original file line number Diff line number Diff line change @@ -133,8 +133,6 @@ if (INTEGRATE_VCPKG)
133133 $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
134134 Snappy::snappy
135135 roaring::roaring
136- roaring::roaring-headers
137- roaring::roaring-headers-cpp
138136 )
139137 if (USE_ASIO)
140138 find_package (asio CONFIG REQUIRED)
Original file line number Diff line number Diff line change @@ -34,6 +34,7 @@ RUN apk add \
3434 python3 \
3535 py3-pip \
3636 perl \
37+ git \
3738 sudo
3839
3940RUN pip3 install pyyaml
@@ -86,6 +87,15 @@ RUN SNAPPY_VERSION=$(dep-version.py snappy) && \
8687 make -j8 && make install && \
8788 rm -rf /snappy-${SNAPPY_VERSION} /${SNAPPY_VERSION}.tar.gz
8889
90+ # Roaring
91+ RUN ROARING_VERSION=$(dep-version.py roaring) && \
92+ curl -O -L https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v${ROARING_VERSION}.tar.gz && \
93+ tar xfz v${ROARING_VERSION}.tar.gz && \
94+ cd CRoaring-${ROARING_VERSION} && \
95+ mkdir build && cd build && CXXFLAGS="-fPIC -O3" cmake .. && \
96+ make -j8 && make install && \
97+ rm -rf /v${ROARING_VERSION}.tar.gz /CRoaring-${ROARING_VERSION}
98+
8999RUN OPENSSL_VERSION=$(dep-version.py openssl) && \
90100 OPENSSL_VERSION_UNDERSCORE=$(echo $OPENSSL_VERSION | sed 's/\. /_/g' ) && \
91101 curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION_UNDERSCORE}.tar.gz && \
Original file line number Diff line number Diff line change @@ -32,7 +32,8 @@ RUN apt-get update -y && \
3232 perl \
3333 dpkg-dev \
3434 python3 \
35- python3-pip
35+ python3-pip \
36+ git
3637
3738RUN pip3 install pyyaml
3839
@@ -91,6 +92,15 @@ RUN SNAPPY_VERSION=$(dep-version.py snappy) && \
9192 make -j8 && make install && \
9293 rm -rf /snappy-${SNAPPY_VERSION} /${SNAPPY_VERSION}.tar.gz
9394
95+ # Roaring
96+ RUN ROARING_VERSION=$(dep-version.py roaring) && \
97+ curl -O -L https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v${ROARING_VERSION}.tar.gz && \
98+ tar xfz v${ROARING_VERSION}.tar.gz && \
99+ cd CRoaring-${ROARING_VERSION} && \
100+ mkdir build && cd build && CXXFLAGS="-fPIC -O3" cmake .. && \
101+ make -j8 && make install && \
102+ rm -rf /v${ROARING_VERSION}.tar.gz /CRoaring-${ROARING_VERSION}
103+
94104RUN OPENSSL_VERSION=$(dep-version.py openssl) && \
95105 OPENSSL_VERSION_UNDERSCORE=$(echo $OPENSSL_VERSION | sed 's/\. /_/g' ) && \
96106 curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_${OPENSSL_VERSION_UNDERSCORE}.tar.gz && \
You can’t perform that action at this time.
0 commit comments