diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2017-10-07 12:38:04 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2017-10-07 12:38:04 -0500 |
| commit | 293b6aaa597ec19a05ff299992a524a6fa3de5bd (patch) | |
| tree | 5ce95d63265b76ba6506a400f91855b4a94ee10c | |
| parent | 98a3b2a5c234b9d21bd2ed60e664c399171aaf13 (diff) | |
| download | libpng-293b6aaa597ec19a05ff299992a524a6fa3de5bd.tar.gz | |
[libpng16] Revert to using the system zlib with the libpng fuzzer
| -rwxr-xr-x | contrib/oss-fuzz/build.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/contrib/oss-fuzz/build.sh b/contrib/oss-fuzz/build.sh index 5cb5f66b4..6f5ae69e2 100755 --- a/contrib/oss-fuzz/build.sh +++ b/contrib/oss-fuzz/build.sh @@ -31,18 +31,15 @@ cat scripts/pnglibconf.dfa | \ > scripts/pnglibconf.dfa.temp mv scripts/pnglibconf.dfa.temp scripts/pnglibconf.dfa -# build zlib library. -(cd ../zlib; ./configure --zprefix; make -j$(nproc) clean; make -j$(nproc) all) - # build the libpng library. +cd ../libpng autoreconf -f -i -CPPFLAGS="-I../zlib" LDFLAGS="-L../zlib" \ - ./configure --with-zlib-prefix=z_ --with-libpng-prefix=OSS_FUZZ_ +./configure --with-libpng-prefix=OSS_FUZZ_ make -j$(nproc) clean make -j$(nproc) libpng16.la # build libpng_read_fuzzer. -$CXX $CXXFLAGS -std=c++11 -I. -I../zlib -L../zlib \ +$CXX $CXXFLAGS -std=c++11 -I. \ $SRC/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc \ -o $OUT/libpng_read_fuzzer \ -lFuzzingEngine .libs/libpng16.a -lz |