aboutsummaryrefslogtreecommitdiffhomepage
path: root/projects/libspng
diff options
context:
space:
mode:
authorGravatar Randy <randy408@protonmail.com>2019-10-24 21:34:55 +0200
committerGravatar Abhishek Arya <inferno@chromium.org>2019-10-24 12:34:55 -0700
commit0646b7284018645f44b98ca7d350b8f383ecff16 (patch)
tree26114a0da488e177772f4e0458f5cf4ad03c6e46 /projects/libspng
parentc6c2802432eb0247b16ecf5b3fbd89893205cc8c (diff)
[libspng] enable i386 build (#2980)
* [libspng] enable i386 build * switch to cmake * fix typo in project.yaml * amd64 -> x86_64 * dummy commit * build.sh: move changes back upstream * dummy commit * dummy commit
Diffstat (limited to 'projects/libspng')
-rw-r--r--projects/libspng/Dockerfile6
-rwxr-xr-xprojects/libspng/build.sh18
-rw-r--r--projects/libspng/project.yaml5
3 files changed, 24 insertions, 5 deletions
diff --git a/projects/libspng/Dockerfile b/projects/libspng/Dockerfile
index 6c3ddcc7..fa3f5f4d 100644
--- a/projects/libspng/Dockerfile
+++ b/projects/libspng/Dockerfile
@@ -19,12 +19,10 @@ FROM gcr.io/oss-fuzz-base/base-builder
MAINTAINER randy408@protonmail.com
RUN apt-get update && \
- apt-get install -y -t xenial-backports ninja-build && \
- apt-get install -y pkg-config zlib1g-dev python3-pip && \
- pip3 install meson
+ apt-get install -y wget tar cmake
RUN git clone --depth 1 https://gitlab.com/randy408/libspng.git
RUN git clone --depth 1 https://github.com/google/fuzzer-test-suite
-RUN cp libspng/tests/build.sh $SRC
WORKDIR libspng
+COPY build.sh $SRC/
diff --git a/projects/libspng/build.sh b/projects/libspng/build.sh
new file mode 100755
index 00000000..15b9a5ee
--- /dev/null
+++ b/projects/libspng/build.sh
@@ -0,0 +1,18 @@
+#!/bin/bash -eu
+# Copyright 2019 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.
+#
+################################################################################
+# Run the OSS-Fuzz script in the project
+$SRC/libspng/tests/ossfuzz.sh
diff --git a/projects/libspng/project.yaml b/projects/libspng/project.yaml
index b1126cd0..0de90d2e 100644
--- a/projects/libspng/project.yaml
+++ b/projects/libspng/project.yaml
@@ -1,4 +1,7 @@
homepage: "https://libspng.org"
primary_contact: "randy408@protonmail.com"
auto_ccs:
- - "randy440088@gmail.com" \ No newline at end of file
+ - "randy440088@gmail.com"
+architectures:
+ - x86_64
+ - i386 \ No newline at end of file