[libzmq] use build script from upstream repository (#4054)

* libzmq: use build script from upstream repository

In order to avoid having to send PRs every time we change something, simply
maintain the build script in the upstream repository, and change build.sh
to a one-line call.

* libzmq: clone corpora and dictionary repository
This commit is contained in:
Luca Boccassi 2020-06-30 21:22:33 +01:00 committed by GitHub
parent 05063afd88
commit 0a7380a80a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 14 deletions

View File

@ -18,6 +18,7 @@ FROM gcr.io/oss-fuzz-base/base-builder
MAINTAINER bluca@debian.org
RUN apt-get update && apt-get install -y make autoconf automake libtool gettext pkg-config build-essential
RUN git clone --depth 1 https://github.com/zeromq/libzmq.git
RUN git clone --depth 1 https://github.com/zeromq/libzmq-fuzz-corpora.git
RUN git clone --depth 1 -b stable https://github.com/jedisct1/libsodium.git
WORKDIR libzmq
COPY build.sh $SRC/

View File

@ -16,17 +16,4 @@
#
################################################################################
# build project and dependencies
cd "${SRC}/libsodium"
DO_NOT_UPDATE_CONFIG_SCRIPTS=1 ./autogen.sh
./configure --disable-shared --prefix=/install_prefix --disable-asm
make -j$(nproc) V=1 install DESTDIR=/tmp/zmq_install_dir
cd "${SRC}/libzmq"
./autogen.sh
export LDFLAGS+=" $(PKG_CONFIG_PATH=/tmp/zmq_install_dir/install_prefix/lib/pkgconfig pkg-config --static --libs --define-prefix libsodium)"
export CXXFLAGS+=" $(PKG_CONFIG_PATH=/tmp/zmq_install_dir/install_prefix/lib/pkgconfig pkg-config --static --cflags --define-prefix libsodium)"
./configure --disable-shared --prefix=/install_prefix --disable-perf --disable-curve-keygen PKG_CONFIG_PATH=/tmp/zmq_install_dir/install_prefix/lib/pkgconfig --with-libsodium=yes --with-fuzzing-installdir=fuzzers --with-fuzzing-engine=$LIB_FUZZING_ENGINE
make -j$(nproc) V=1 install DESTDIR=/tmp/zmq_install_dir
cp /tmp/zmq_install_dir/install_prefix/fuzzers/* "${OUT}"
${SRC}/libzmq/builds/fuzz/ci_build.sh