Skip to content

Commit

Permalink
Test new base image for Action pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
NoMore201 committed Nov 29, 2024
1 parent 2f38ecd commit a013aa8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:
name: Toolchain build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ stamps/build-gcc-stage2-only: $(GCC_SRCDIR) stamps/install-deps
stamps/build-qemu: $(QEMU_SRCDIR)
rm -rf $@ $(notdir $@)
mkdir $(notdir $@)
if test "$(QEMU_CONFIGURE_HOST)" = "--cross-prefix=x86_64-w64-mingw32-"; then cd $(notdir $@) && $(srcdir)/scripts/install-mingw32-glib $(INSTALL_DIR); fi
if test "$(QEMU_CONFIGURE_HOST)" = "--cross-prefix=x86_64-w64-mingw32-"; then cd $(notdir $@) && $(srcdir)/scripts/install-mingw32-deps $(INSTALL_DIR); fi
cd $(notdir $@) && $(QEMU_ENV_VARS) $</configure \
--prefix=$(INSTALL_DIR) \
$(QEMU_CONFIGURE_HOST) \
Expand Down
7 changes: 3 additions & 4 deletions scripts/install-deps
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ then
fi

apt-get update
apt-get -y install build-essential texinfo \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
build-essential texinfo \
flex bison libmpfr-dev libgmp-dev libmpc-dev zip libdebuginfod-dev \
gcc-mingw-w64 g++-mingw-w64 mingw-w64-tools \
git libglib2.0-dev libfdt-dev libpixman-1-dev zlib1g-dev ninja-build \
python3-dev python3-pip

pip install meson
python3-dev python3-pip wget meson
9 changes: 6 additions & 3 deletions scripts/install-mingw32-glib → scripts/install-mingw32-deps
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

set -e

GLIB_SRC_URL="https://download.gnome.org/sources/glib/2.83/glib-2.83.0.tar.xz"
GLIB_TARBALL="glib-2.83.0.tar.xz"
GLIB_SRC_URL="https://download.gnome.org/sources/glib/2.83/$GLIB_TARBALL"

if [ $# -ne 1 ]; then
echo "Script require install prefix path as parameters"
Expand All @@ -11,8 +12,10 @@ fi

INSTALL_PREFIX=$1

wget "$GLIB_SRC_URL"
tar xJf glib-2.83.0.tar.xz
if [ ! -f $GLIB_TARBALL ]; then
wget "$GLIB_SRC_URL"
fi
tar xJf $GLIB_TARBALL
cd glib-2.83.0

cat > x86_64-w64-mingw32.txt <<HereDoc
Expand Down

0 comments on commit a013aa8

Please sign in to comment.