diff options
| author | Chris Wolfe <chriswwolfe@gmail.com> | 2020-04-12 17:26:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 17:26:12 -0700 |
| commit | 345abf4d3856342dad054eb6f541353d1a79c8db (patch) | |
| tree | eab64319d808c5b06cd7fdf7c841186be894231b /projects/json-c | |
| parent | 1eea5653d2669fdae61b18884bffbd154f539656 (diff) | |
| download | oss-fuzz-345abf4d3856342dad054eb6f541353d1a79c8db.tar.gz | |
switch to cmake, find new headers (#3630)
Diffstat (limited to 'projects/json-c')
| -rw-r--r-- | projects/json-c/Dockerfile | 2 | ||||
| -rwxr-xr-x | projects/json-c/build.sh | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/projects/json-c/Dockerfile b/projects/json-c/Dockerfile index c63d6b7ab..ed40c49de 100644 --- a/projects/json-c/Dockerfile +++ b/projects/json-c/Dockerfile @@ -16,7 +16,7 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER chriswwolfe@gmail.com -RUN apt-get update && apt-get install -y make autoconf automake libtool +RUN apt-get update && apt-get install -y make cmake RUN git clone --depth 1 https://github.com/json-c/json-c.git json-c WORKDIR json-c COPY build.sh *.cc *.dict $SRC/ diff --git a/projects/json-c/build.sh b/projects/json-c/build.sh index 244504d0f..9f7128abe 100755 --- a/projects/json-c/build.sh +++ b/projects/json-c/build.sh @@ -14,17 +14,17 @@ # limitations under the License. # ################################################################################ - -./autogen.sh -./configure --enable-static --disable-shared -make -j$(nproc) all -ar rc json_c.a *.o +mkdir json-c-build +cd json-c-build +cmake -DBUILD_SHARED_LIBS=OFF .. +make -j$(nproc) +cd .. cp $SRC/*.dict $OUT/ for f in $SRC/*_fuzzer.cc; do fuzzer=$(basename "$f" _fuzzer.cc) - $CXX $CXXFLAGS -std=c++11 -I$SRC/json-c \ + $CXX $CXXFLAGS -std=c++11 -I$SRC/json-c -I$SRC/json-c/json-c-build\ $SRC/${fuzzer}_fuzzer.cc -o $OUT/${fuzzer}_fuzzer \ - $LIB_FUZZING_ENGINE $SRC/json-c/json_c.a + $LIB_FUZZING_ENGINE $SRC/json-c/json-c-build/libjson-c.a done |