aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nick Mathewson <nickm@torproject.org>2020-01-23 11:53:45 -0500
committerGravatar Max Moroz <mmoroz@chromium.org>2020-01-23 08:53:45 -0800
commitd435df7f50d604314de2491bd976445c7302fe74 (patch)
treefc163c869be146f1c9da595c6ba321c930c040f1
parent25cb4621aacf8e40c855bc3e9745af1653b59654 (diff)
[Tor] Build libevent with --disable-openssl (#3289)
* [Tor] Build libevent with --disable-openssl Libevent's build is failing because it can't find openssl. We could try to fix this, but instead let's disable it: Tor doesn't actually use Libvent's openssl support. * [tor] Use zip -q to make logs shorter. Suggestion from Max Moroz.
-rw-r--r--projects/tor/build.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/projects/tor/build.sh b/projects/tor/build.sh
index 9f0b3db2..1c5154a9 100644
--- a/projects/tor/build.sh
+++ b/projects/tor/build.sh
@@ -22,7 +22,7 @@ mkdir -p $TOR_DEPS
# Build libevent with proper instrumentation.
cd ${SRC}/libevent
sh autogen.sh
-./configure --prefix=${TOR_DEPS}
+./configure --prefix=${TOR_DEPS} --disable-openssl
make -j$(nproc) clean
make -j$(nproc) all
make install
@@ -79,6 +79,8 @@ for fuzzer in src/test/fuzz/*.a; do
corpus_dir="${SRC}/tor-fuzz-corpora/${output#oss-fuzz-}"
if [ -d "${corpus_dir}" ]; then
- zip -j ${OUT}/${output}_seed_corpus.zip ${corpus_dir}/*
+ set +x
+ zip -q -j ${OUT}/${output}_seed_corpus.zip ${corpus_dir}/*
+ set -x
fi
done