Skip to content

Commit ed647d2

Browse files
committed
Build OpenSSL in build.sh so that it's instrumented
1 parent d7b5667 commit ed647d2

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

projects/arrow/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ RUN wget https://github.com/boostorg/boost/releases/download/boost-${boost_versi
3535
cmake .. -GNinja -DBOOST_INCLUDE_LIBRARIES="${boost_components}" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF && \
3636
cmake --build . --target install
3737

38-
ARG openssl_version=3.5.4
39-
40-
RUN wget https://github.com/openssl/openssl/releases/download/openssl-${openssl_version}/openssl-${openssl_version}.tar.gz && \
41-
tar -xf openssl-${openssl_version}.tar.gz && \
42-
cd openssl-${openssl_version} && \
43-
./Configure no-apps no-docs no-tests no-shared && \
44-
make -j && make install
45-
4638
RUN git clone --depth=1 --recurse-submodules \
4739
https://github.com/apache/arrow.git $SRC/arrow
4840

projects/arrow/build.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,20 @@
1515
#
1616
################################################################################
1717

18+
# 1. Build instrumented OpenSSL
19+
20+
OPENSSL_VERSION=3.5.4
21+
22+
cd /root
23+
wget https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz
24+
tar -xf openssl-${OPENSSL_VERSION}.tar.gz
25+
cd openssl-${OPENSSL_VERSION}
26+
./Configure no-apps no-docs no-tests no-shared
27+
make -j
28+
make install
29+
30+
# 2. Build Arrow C++ proper
31+
1832
ARROW=${SRC}/arrow/cpp
1933

2034
BUILD_DIR=${SRC}/build-dir
@@ -67,4 +81,3 @@ ${ARROW}/build-support/fuzzing/generate_corpuses.sh ${BUILD_DIR}/release
6781
find . -executable -name "*-fuzz" -exec cp -a -v '{}' ${OUT} \;
6882
# Copy seed corpuses
6983
find . -name "*-fuzz_seed_corpus.zip" -exec cp -a -v '{}' ${OUT} \;
70-

0 commit comments

Comments
 (0)