Skip to content

Commit

Permalink
Added texinfo to the build images, accidentally needed to build libbf…
Browse files Browse the repository at this point in the history
…d for CI.
  • Loading branch information
UncombedCoconut committed Aug 9, 2022
1 parent 167dafe commit 80cc4ee
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
- `naev-steamruntime` (Used for linux steam builds in the steamruntime (soldier) environment)
- `naev-windows` (Used to cross compile for Windows.)

### v1.6.1
Added texinfo to the build images, accidentally needed to build libbfd for CI.

### v1.6
Added `naev-artwork` image, rocking some ImageMagick, GraphicsMagick, Blender 2.79b

Expand Down
2 changes: 1 addition & 1 deletion naev-linux-latest/Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build
gettext-devel glpk-devel file ffmpeg-free libpng12-devel libxml2-devel libvorbis-devel libwebp-devel libunibreak-devel \
luajit-devel openal-soft-devel openblas-devel pcre2-devel physfs-devel SDL2-devel SDL2_image-devel suitesparse-devel \
# Install utilities
git libevent lua nano ncurses python3-pyyaml python3-mutagen readline tar xz unzip zip && \
git libevent lua nano ncurses python3-pyyaml python3-mutagen readline tar texinfo xz unzip zip && \
microdnf clean all && \
# Verify tool versions and install locations.
echo "Verifying python install" && \
Expand Down
2 changes: 1 addition & 1 deletion naev-linux-lts/Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN yum -y install epel-release && \
libunibreak-devel luajit-devel openal-soft-devel openblas-devel pcre2-devel SDL2-devel \
SDL2_image-devel \
# Install utilities
git nano tar xz unzip zip && \
git nano tar texinfo xz unzip zip && \
yum clean all && \
# Install pyyaml
python3 -m pip install PyYAML && \
Expand Down
2 changes: 1 addition & 1 deletion naev-macos/Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ ENV HOST "aarch64-apple-darwin20.1"
ENV APPIMAGE_EXTRACT_AND_RUN 1

# Install build tools.
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pip python3-pyyaml unzip tar xz zlib zip && \
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pip python3-pyyaml unzip tar texinfo xz zlib zip && \
microdnf clean all && \
# Update Meson to a pre-release, due to a bug cross-compiling with link-time optimization enabled. (python3-pip is unnecessary once this step is.)
python3 -m pip install git+https://github.com/mesonbuild/meson.git@ec388fe7c2b93879499ad782c2da41ec22d003b2 && \
Expand Down
2 changes: 1 addition & 1 deletion naev-macos/Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM registry.fedoraproject.org/fedora-minimal:latest AS build

# Install Build dependencies and utilities.
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install bzip2 clang cmake git file findutils patch python3 \
openssl openssl-devel xz-devel libxml2-devel llvm-devel uuid-devel unzip tar xz zlib-devel && \
openssl openssl-devel xz-devel libxml2-devel llvm-devel uuid-devel unzip tar texinfo xz zlib-devel && \
microdnf clean all && \
# Verify tool / language versions versions.
echo "Verifying clang install" && \
Expand Down
4 changes: 2 additions & 2 deletions naev-steamruntime/Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ ENV IMAGE_NAME "naev-steamruntime"

# Install pip from steam/debian repositories.
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip \
# Naughty: we need libwebp, ,libpcre2 and libopenblas, not in the SDK.... All are statically linked when building with the steamruntime option in meson set to true.
libopenblas-dev libwebp-dev libpcre2-dev && \
# Naughty: we need libwebp, ,libpcre2 and libopenblas, not in the SDK.... All are statically linked when building with the steamruntime option in meson set to true. Also, texinfo is an accidental build dependency for libbfd.
libopenblas-dev libwebp-dev libpcre2-dev texinfo && \
apt-get clean && \
# Upgrade meson via pip.
python3 -m pip install meson --upgrade && \
Expand Down
2 changes: 1 addition & 1 deletion naev-windows/Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV IMAGE_NAME "naev-windows"

WORKDIR /tmp
# Install build requirements
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install gcc gettext git meson ninja-build python3-pyyaml tar xz unzip zip \
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install gcc gettext git meson ninja-build python3-pyyaml tar texinfo xz unzip zip \
# Install mingw64 packages
mingw64-gcc mingw64-freetype mingw64-libvorbis mingw64-libxml2 mingw64-openal-soft \
mingw64-SDL2 mingw64-SDL2_image mingw64-libpng mingw32-nsis mingw64-pcre2 && \
Expand Down

0 comments on commit 80cc4ee

Please sign in to comment.