mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-11 03:24:58 -06:00
target/hexagon: manually add flex/bison/glib2 to remaining containers
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> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20220804115548.13024-11-anjo@rev.ng> Message-Id: <20220929114231.583801-9-alex.bennee@linaro.org>
This commit is contained in:
parent
8fae3910e2
commit
3de61b9856
5 changed files with 15 additions and 2 deletions
|
@ -33,7 +33,8 @@ msys2-64bit:
|
||||||
extends: .shared_msys2_builder
|
extends: .shared_msys2_builder
|
||||||
script:
|
script:
|
||||||
- .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
|
- .\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-capstone
|
||||||
mingw-w64-x86_64-curl
|
mingw-w64-x86_64-curl
|
||||||
mingw-w64-x86_64-cyrus-sasl
|
mingw-w64-x86_64-cyrus-sasl
|
||||||
|
@ -67,7 +68,8 @@ msys2-32bit:
|
||||||
extends: .shared_msys2_builder
|
extends: .shared_msys2_builder
|
||||||
script:
|
script:
|
||||||
- .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
|
- .\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-capstone
|
||||||
mingw-w64-i686-curl
|
mingw-w64-i686-curl
|
||||||
mingw-w64-i686-cyrus-sasl
|
mingw-w64-i686-cyrus-sasl
|
||||||
|
|
|
@ -16,13 +16,16 @@ RUN apt update && \
|
||||||
|
|
||||||
# Install common build utilities
|
# Install common build utilities
|
||||||
RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
|
RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
|
||||||
|
bison \
|
||||||
bc \
|
bc \
|
||||||
build-essential \
|
build-essential \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
debian-ports-archive-keyring \
|
debian-ports-archive-keyring \
|
||||||
dpkg-dev \
|
dpkg-dev \
|
||||||
|
flex \
|
||||||
gettext \
|
gettext \
|
||||||
git \
|
git \
|
||||||
|
libglib2.0-dev \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
python3
|
python3
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
FROM registry.fedoraproject.org/fedora:34
|
FROM registry.fedoraproject.org/fedora:34
|
||||||
|
|
||||||
ENV PACKAGES \
|
ENV PACKAGES \
|
||||||
|
bison \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
ccache \
|
ccache \
|
||||||
diffutils \
|
diffutils \
|
||||||
|
flex \
|
||||||
findutils \
|
findutils \
|
||||||
gcc \
|
gcc \
|
||||||
git \
|
git \
|
||||||
|
|
|
@ -3,13 +3,16 @@ FROM registry.fedoraproject.org/fedora:35
|
||||||
# Please keep this list sorted alphabetically
|
# Please keep this list sorted alphabetically
|
||||||
ENV PACKAGES \
|
ENV PACKAGES \
|
||||||
bc \
|
bc \
|
||||||
|
bison \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
ccache \
|
ccache \
|
||||||
diffutils \
|
diffutils \
|
||||||
findutils \
|
findutils \
|
||||||
|
flex \
|
||||||
gcc \
|
gcc \
|
||||||
gettext \
|
gettext \
|
||||||
git \
|
git \
|
||||||
|
glib2-devel \
|
||||||
hostname \
|
hostname \
|
||||||
make \
|
make \
|
||||||
meson \
|
meson \
|
||||||
|
|
|
@ -3,13 +3,16 @@ FROM registry.fedoraproject.org/fedora:35
|
||||||
# Please keep this list sorted alphabetically
|
# Please keep this list sorted alphabetically
|
||||||
ENV PACKAGES \
|
ENV PACKAGES \
|
||||||
bc \
|
bc \
|
||||||
|
bison \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
ccache \
|
ccache \
|
||||||
diffutils \
|
diffutils \
|
||||||
findutils \
|
findutils \
|
||||||
|
flex \
|
||||||
gcc \
|
gcc \
|
||||||
gettext \
|
gettext \
|
||||||
git \
|
git \
|
||||||
|
glib2-devel \
|
||||||
hostname \
|
hostname \
|
||||||
make \
|
make \
|
||||||
meson \
|
meson \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue