Skip to content

Commit 77b6574

Browse files
qemu: fix build (#13108)
Signed-off-by: David Korczynski <[email protected]>
1 parent 26b3ab6 commit 77b6574

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

projects/qemu/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ ARG glib_tag=2.78.4
1919
RUN apt-get update && apt-get install -y make autoconf automake libtool ninja-build \
2020
libfdt-dev libpixman-1-dev zlib1g-dev libslirp-dev patchelf wget \
2121
libattr1 libattr1-dev libcap-ng-dev pkg-config
22-
RUN git clone --depth 1 --branch $glib_tag https://gitlab.gnome.org/GNOME/glib
22+
23+
Run python3 -m pip install meson tomli
24+
RUN git clone --depth 1 https://gitlab.gnome.org/GNOME/glib.git --branch=$glib_tag && \
25+
meson setup _build glib --prefix=/usr -Ddefault_library=shared -Dtests=false && \
26+
meson install -C _build && \
27+
rm -rf glib _build
28+
2329
RUN git clone --depth 1 https://git.qemu.org/git/qemu.git qemu
2430
WORKDIR qemu
2531
COPY build.sh $SRC/

projects/qemu/build.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,5 @@
1414
#
1515
################################################################################
1616

17-
pip3 install meson tomli
18-
19-
cd $SRC/glib
20-
CC="" CFLAGS="" CXX="" CXXFLAGS="" meson setup --buildtype=plain --default-library=shared builddir -Dtests=false
21-
CC="" CFLAGS="" CXX="" CXXFLAGS="" ninja -C builddir
22-
ninja -C builddir install
23-
2417
cd $SRC/qemu/
2518
$SRC/qemu/scripts/oss-fuzz/build.sh

0 commit comments

Comments
 (0)