Build with hdf5 and zlib support (#2794)

projects/matio/Dockerfile

@@ -16,8 +16,10 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER t-beu@users.sourceforge.net
-RUN apt-get update && apt-get install -y make autoconf automake libtool
+RUN apt-get update && apt-get install -y make autoconf automake libtool libhdf5-dev zlib1g-dev
+ENV HDF5_DIR /usr/lib/x86_64-linux-gnu/hdf5/serial
 RUN git clone --depth 1 git://git.code.sf.net/p/matio/matio matio
 WORKDIR matio
+ADD https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz szip.tar.gz
 COPY build.sh $SRC/
 COPY *.cc *.h $SRC/

projects/matio/build.sh

@@ -15,9 +15,16 @@
 #
 ################################################################################
 
+# build szip
+tar -xvf szip.tar.gz
+cd szip-2.1.1
+./configure --disable-shared CFLAGS="-w"
+make -C src
+cd ..
+
 # build project
 ./autogen.sh
-./configure
+./configure --with-hdf5=$HDF5_DIR
 make -j$(nproc)
 make install
 
@@ -26,5 +33,5 @@ for fuzzers in $(find $SRC -name '*_fuzzer.cc'); do
   base=$(basename -s .cc $fuzzers)
   $CXX $CXXFLAGS -std=c++11 -Iinclude \
   $fuzzers ./getopt/.libs/libgetopt.a \
-  ./src/.libs/libmatio.a -o $OUT/$base $LIB_FUZZING_ENGINE
+  ./src/.libs/libmatio.a -o $OUT/$base $LIB_FUZZING_ENGINE $HDF5_DIR/libhdf5.a ./szip-2.1.1/src/.libs/libsz.a -lz
 done

projects/matio/project.yaml

@@ -6,4 +6,3 @@ sanitizers:
   - undefined
 architectures:
   - x86_64
-  - i386