diff options
| author |  Glenn Randers-Pehrson <glennrp@gmail.com> | 2017-09-30 14:22:01 -0400 |
|---|---|---|
| committer |  Abhishek Arya <inferno@chromium.org> | 2017-09-30 11:22:01 -0700 |
| commit | 43df131e83534c75e24de44146483c94dceccd74 (patch) | |
| tree | 836cc9325495e06eff9461c0b9ff356d583c605d /projects | |
| parent | eebdc80cb913926fbe1eb278ccd245143b990125 (diff) | |
Use libpng's build.sh (#869)
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/libpng/Dockerfile | 6 | ||||
| -rw-r--r-- | projects/libpng/build.sh | 50 |
2 files changed, 3 insertions, 53 deletions
diff --git a/projects/libpng/Dockerfile b/projects/libpng/Dockerfile index 7e4d1ebf..c91bf5ef 100644 --- a/projects/libpng/Dockerfile +++ b/projects/libpng/Dockerfile @@ -16,9 +16,9 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER glennrp@gmail.com -RUN apt-get update && apt-get install -y make autoconf automake libtool zlib1g-dev +RUN apt-get update && \ + apt-get install -y make autoconf automake libtool zlib1g-dev RUN git clone --depth 1 https://github.com/glennrp/libpng.git -RUN (cd libpng; git log | head -1) +RUN cp libpng/contrib/oss-fuzz/build.sh $SRC WORKDIR libpng -COPY build.sh $SRC/ diff --git a/projects/libpng/build.sh b/projects/libpng/build.sh deleted file mode 100644 index 7b8150f4..00000000 --- a/projects/libpng/build.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -eu -# Copyright 2017 Glenn Randers-Pehrson -# Copyright 2016 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Last changed in libpng 1.6.32 [August 24, 2017] -# -# Revisions by Glenn Randers-Pehson, 2017: -# 1. Build only the library, not the tools (changed "make -j$(nproc) all" to -# "make -j$(nproc) libpng16.la"). -# 2. Disabled WARNING and WRITE options in pnglibconf.dfa. -################################################################################ - -# Disable logging via library build configuration control. -cat scripts/pnglibconf.dfa | \ - sed -e "s/option STDIO/option STDIO disabled/" \ - -e "s/option WARNING /option WARNING disabled/" \ - -e "s/option WRITE enables WRITE_INT_FUNCTIONS/option WRITE disabled/" \ -> scripts/pnglibconf.dfa.temp -mv scripts/pnglibconf.dfa.temp scripts/pnglibconf.dfa - -# build the library. -autoreconf -f -i -./configure -make -j$(nproc) clean -make -j$(nproc) libpng16.la - -# build libpng_read_fuzzer. -$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 - -# add seed corpus. -find $SRC/libpng -name "*.png" | \ - xargs zip $OUT/libpng_read_fuzzer_seed_corpus.zip - -cp $SRC/libpng/contrib/oss-fuzz/*.dict \ - $SRC/libpng/contrib/oss-fuzz/*.options $OUT/ |