diff options
| author |  Khaled Hosny <khaledhosny@eglug.org> | 2018-07-17 17:58:23 +0300 |
|---|---|---|
| committer |  Max Moroz <dor3s1@gmail.com> | 2018-07-17 07:58:23 -0700 |
| commit | 70359530a7cef88e297041934c3383a54ea2eb80 (patch) | |
| tree | 00e699ce3a0d7fec645154c153744c1e969b39e3 /projects/ots | |
| parent | d69a8ea80da1611e55d1e9a441087568ecbd86f6 (diff) | |
[ots] Update build to use meson (#1620)
Diffstat (limited to 'projects/ots')
| -rw-r--r-- | projects/ots/Dockerfile | 3 | ||||
| -rwxr-xr-x | projects/ots/build.sh | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/projects/ots/Dockerfile b/projects/ots/Dockerfile index 4b867084..36e5cfbd 100644 --- a/projects/ots/Dockerfile +++ b/projects/ots/Dockerfile @@ -16,7 +16,8 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER mmoroz@chromium.org -RUN apt-get update && apt-get install -y make autoconf automake libtool pkg-config zlib1g-dev +RUN apt-get update && apt-get install -y python3-pip pkg-config zlib1g-dev && \ + pip3 install meson ninja RUN git clone --depth 1 https://github.com/khaledhosny/ots.git WORKDIR ots COPY build.sh ots-fuzzer.* $SRC/ diff --git a/projects/ots/build.sh b/projects/ots/build.sh index 02d9db66..c7750e7a 100755 --- a/projects/ots/build.sh +++ b/projects/ots/build.sh @@ -16,12 +16,13 @@ ################################################################################ # Build the project. -./autogen.sh -./configure +meson build # Build the fuzzer. -make -j$(nproc) V=1 CXXFLAGS="$CXXFLAGS -DOTS_FUZZER_NO_MAIN" LDFLAGS="-lFuzzingEngine" ots-fuzzer -mv ots-fuzzer $OUT/ +export CXXFLAGS="$CXXFLAGS -DOTS_FUZZER_NO_MAIN" +export LDFLAGS="-lFuzzingEngine" +ninja -v -j$(nproc) -C build ots-fuzzer +mv build/ots-fuzzer $OUT/ cp $SRC/ots-fuzzer.options $OUT/ zip -j -r $OUT/ots-fuzzer_seed_corpus.zip $SRC/ots/tests/fonts |