Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add meson to all images
  • Loading branch information
JonasVautherin authored and Jonas Vautherin committed Jan 9, 2023
1 parent c9273a2 commit 4f590a1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -15,6 +15,7 @@ Cross compiling toolchains in Docker images.
- Commands in the container are run as the calling user, so that any created files have the expected ownership, (i.e. not root).
- Make variables **CC**, **CXX**, **LD**, **AS** etc) are set to point to the appropriate tools in the container.
- Recent [CMake](https://cmake.org) and ninja are precompiled.
- [Meson](https://mesonbuild.com) is pre-installed.
- [Conan.io](https://www.conan.io) can be used as a package manager.
- Toolchain files configured for CMake.
- Current directory is mounted as the container\'s workdir, `/work`.
Expand Down
2 changes: 1 addition & 1 deletion imagefiles/install-python-packages.sh
Expand Up @@ -27,6 +27,6 @@ ${PYTHON} get-pip.py --ignore-installed
rm get-pip.py

${PYTHON} -m pip install --upgrade --ignore-installed setuptools
${PYTHON} -m pip install --ignore-installed conan
${PYTHON} -m pip install --ignore-installed conan meson
# Purge cache to save space: https://stackoverflow.com/questions/37513597/is-it-safe-to-delete-cache-pip-directory
${PYTHON} -m pip cache purge

0 comments on commit 4f590a1

Please sign in to comment.