diff options
| author | Luca Boccassi <luca.boccassi@gmail.com> | 2020-06-30 21:22:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 13:22:33 -0700 |
| commit | 0a7380a80a0f7bc8416dc554b66951119365a66d (patch) | |
| tree | 988fb71e501292943b83995a73d4561b9790c1ee /projects | |
| parent | 05063afd888a40173816327ac7510a6867626a6f (diff) | |
| download | oss-fuzz-0a7380a80a0f7bc8416dc554b66951119365a66d.tar.gz | |
[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
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/libzmq/Dockerfile | 1 | ||||
| -rwxr-xr-x | projects/libzmq/build.sh | 15 |
2 files changed, 2 insertions, 14 deletions
diff --git a/projects/libzmq/Dockerfile b/projects/libzmq/Dockerfile index 40769f294..9299d8c23 100644 --- a/projects/libzmq/Dockerfile +++ b/projects/libzmq/Dockerfile @@ -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/ diff --git a/projects/libzmq/build.sh b/projects/libzmq/build.sh index 389b7f65f..519696f63 100755 --- a/projects/libzmq/build.sh +++ b/projects/libzmq/build.sh @@ -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 |