From 9a9a3cea1a8406453a598abc6b9eb9dc27a67030 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 17 Sep 2021 16:02:17 +0200
Subject: [PATCH] qemu: Simplify build script (#6468)

---
 projects/qemu/Dockerfile |  9 +--------
 projects/qemu/build.sh   | 12 ------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/projects/qemu/Dockerfile b/projects/qemu/Dockerfile
index 0bc5ed993..bf780b8b4 100644
--- a/projects/qemu/Dockerfile
+++ b/projects/qemu/Dockerfile
@@ -15,16 +15,9 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-RUN apt-get update && apt-get install -y make autoconf automake libtool \
+RUN apt-get update && apt-get install -y make autoconf automake libtool ninja-build libglib2.0-dev \
     libfdt-dev libpixman-1-dev zlib1g-dev patchelf wget \
     libattr1 libattr1-dev libcap-ng-dev pkg-config
-# Ninja in the apt repos is too old. Get it directly from github
-RUN wget https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip \
-    && unzip ninja-linux.zip \
-    && rm ninja-linux.zip \
-    && mv ninja /usr/bin/ninja
-ADD https://download.gnome.org/sources/glib/2.67/glib-2.67.6.tar.xz $SRC
-RUN tar xvJf $SRC/glib-2.67.6.tar.xz
 RUN git clone --depth 1 https://git.qemu.org/git/qemu.git qemu
 WORKDIR qemu
 COPY build.sh $SRC/
diff --git a/projects/qemu/build.sh b/projects/qemu/build.sh
index e4c9a8b7c..94c71431a 100755
--- a/projects/qemu/build.sh
+++ b/projects/qemu/build.sh
@@ -17,16 +17,4 @@
 
 pip3 install meson
 
-# Version of glib in Ubuntu Xenial is too old
-pushd $SRC/glib-2.67.6
-meson _build \
-    -Doss_fuzz=enabled \
-    -Dinternal_pcre=true \
-    --default-library=static \
-    -Db_lundef=false \
-    -Dlibmount=disabled
-ninja -C _build
-ninja -C _build install
-popd
-
 ./scripts/oss-fuzz/build.sh