[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v11 10/15] target/hexagon: manually add flex/bison/glib2 to remai
From: |
Anton Johansson |
Subject: |
[PATCH v11 10/15] target/hexagon: manually add flex/bison/glib2 to remaining containers |
Date: |
Thu, 4 Aug 2022 13:55:43 +0200 |
Adds our build-time dependencies to containers which build qemu-hexagon,
but aren't covered by libvirt-ci.
Signed-off-by: Anton Johansson <anjo@rev.ng>
---
.gitlab-ci.d/windows.yml | 6 ++++--
tests/docker/dockerfiles/debian-riscv64-cross.docker | 3 +++
tests/docker/dockerfiles/debian-tricore-cross.docker | 1 +
tests/docker/dockerfiles/debian10.docker | 3 +++
tests/docker/dockerfiles/fedora-i386-cross.docker | 2 ++
tests/docker/dockerfiles/fedora-win32-cross.docker | 3 +++
tests/docker/dockerfiles/fedora-win64-cross.docker | 3 +++
7 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index c4bde758be..17dbd35725 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -33,7 +33,8 @@ msys2-64bit:
extends: .shared_msys2_builder
script:
- .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
- diffutils git grep make sed
+ bison diffutils flex
+ git grep make sed
mingw-w64-x86_64-capstone
mingw-w64-x86_64-curl
mingw-w64-x86_64-cyrus-sasl
@@ -68,7 +69,8 @@ msys2-32bit:
extends: .shared_msys2_builder
script:
- .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
- diffutils git grep make sed
+ bison diffutils flex
+ git grep make sed
mingw-w64-i686-capstone
mingw-w64-i686-curl
mingw-w64-i686-cyrus-sasl
diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker
b/tests/docker/dockerfiles/debian-riscv64-cross.docker
index 594d97982c..9715791e0b 100644
--- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
@@ -16,13 +16,16 @@ RUN apt update && \
# Install common build utilities
RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
+ bison \
bc \
build-essential \
ca-certificates \
debian-ports-archive-keyring \
dpkg-dev \
+ flex \
gettext \
git \
+ libglib2.0-dev \
ninja-build \
pkg-config \
python3
diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker
b/tests/docker/dockerfiles/debian-tricore-cross.docker
index b573b9ded2..63f977066c 100644
--- a/tests/docker/dockerfiles/debian-tricore-cross.docker
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -19,6 +19,7 @@ RUN apt update && \
bison \
bzip2 \
ca-certificates \
+ flex \
ccache \
g++ \
gcc \
diff --git a/tests/docker/dockerfiles/debian10.docker
b/tests/docker/dockerfiles/debian10.docker
index 03be923066..1fc2fc1ddb 100644
--- a/tests/docker/dockerfiles/debian10.docker
+++ b/tests/docker/dockerfiles/debian10.docker
@@ -18,15 +18,18 @@ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
apt install -y --no-install-recommends \
bc \
+ bison \
build-essential \
ca-certificates \
ccache \
clang \
dbus \
+ flex \
gdb-multiarch \
gettext \
git \
libffi-dev \
+ libglib2.0-dev \
libncurses5-dev \
ninja-build \
pkg-config \
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker
b/tests/docker/dockerfiles/fedora-i386-cross.docker
index 0a3ec346e6..7eec648d2d 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -1,9 +1,11 @@
FROM registry.fedoraproject.org/fedora:34
ENV PACKAGES \
+ bison \
bzip2 \
ccache \
diffutils \
+ flex \
findutils \
gcc \
git \
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker
b/tests/docker/dockerfiles/fedora-win32-cross.docker
index a06bd29e8e..aca37aabc4 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -3,13 +3,16 @@ FROM registry.fedoraproject.org/fedora:35
# Please keep this list sorted alphabetically
ENV PACKAGES \
bc \
+ bison \
bzip2 \
ccache \
diffutils \
findutils \
+ flex \
gcc \
gettext \
git \
+ glib2-devel \
hostname \
make \
meson \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker
b/tests/docker/dockerfiles/fedora-win64-cross.docker
index b71624330f..3642766479 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -3,13 +3,16 @@ FROM registry.fedoraproject.org/fedora:35
# Please keep this list sorted alphabetically
ENV PACKAGES \
bc \
+ bison \
bzip2 \
ccache \
diffutils \
findutils \
+ flex \
gcc \
gettext \
git \
+ glib2-devel \
hostname \
make \
meson \
--
2.37.0
- [PATCH v11 08/15] target/hexagon: add flex/bison/glib2 to qemu.yml, (continued)
- [PATCH v11 08/15] target/hexagon: add flex/bison/glib2 to qemu.yml, Anton Johansson, 2022/08/04
- [PATCH v11 04/15] target/hexagon: make helper functions non-static, Anton Johansson, 2022/08/04
- [PATCH v11 01/15] target/hexagon: update MAINTAINERS for idef-parser, Anton Johansson, 2022/08/04
- [PATCH v11 02/15] target/hexagon: import README for idef-parser, Anton Johansson, 2022/08/04
- [PATCH v11 05/15] target/hexagon: introduce new helper functions, Anton Johansson, 2022/08/04
- [PATCH v11 03/15] target/hexagon: make slot number an unsigned, Anton Johansson, 2022/08/04
- [PATCH v11 11/15] target/hexagon: import lexer for idef-parser, Anton Johansson, 2022/08/04
- [PATCH v11 09/15] target/hexagon: regenerate docker/cirrus files, Anton Johansson, 2022/08/04
- [PATCH v11 06/15] target/hexagon: expose next PC in DisasContext, Anton Johansson, 2022/08/04
- [PATCH v11 07/15] target/hexagon: prepare input for the idef-parser, Anton Johansson, 2022/08/04
- [PATCH v11 10/15] target/hexagon: manually add flex/bison/glib2 to remaining containers,
Anton Johansson <=
- [PATCH v11 12/15] target/hexagon: prepare frontend for parser, Anton Johansson, 2022/08/04
- [PATCH v11 14/15] target/hexagon: call idef-parser functions, Anton Johansson, 2022/08/04
- [PATCH v11 15/15] target/hexagon: import additional tests, Anton Johansson, 2022/08/04
- [PATCH v11 13/15] target/hexagon: import parser for idef-parser, Anton Johansson, 2022/08/04