Skip to content
This repository was archived by the owner on Aug 30, 2025. It is now read-only.

Commit 80cc4ee

Browse files
Added texinfo to the build images, accidentally needed to build libbfd for CI.
1 parent 167dafe commit 80cc4ee

File tree

7 files changed

+10
-7
lines changed

7 files changed

+10
-7
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
- `naev-steamruntime` (Used for linux steam builds in the steamruntime (soldier) environment)
1010
- `naev-windows` (Used to cross compile for Windows.)
1111

12+
### v1.6.1
13+
Added texinfo to the build images, accidentally needed to build libbfd for CI.
14+
1215
### v1.6
1316
Added `naev-artwork` image, rocking some ImageMagick, GraphicsMagick, Blender 2.79b
1417

naev-linux-latest/Dockerfile.amd64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install meson ninja-build
3838
gettext-devel glpk-devel file ffmpeg-free libpng12-devel libxml2-devel libvorbis-devel libwebp-devel libunibreak-devel \
3939
luajit-devel openal-soft-devel openblas-devel pcre2-devel physfs-devel SDL2-devel SDL2_image-devel suitesparse-devel \
4040
# Install utilities
41-
git libevent lua nano ncurses python3-pyyaml python3-mutagen readline tar xz unzip zip && \
41+
git libevent lua nano ncurses python3-pyyaml python3-mutagen readline tar texinfo xz unzip zip && \
4242
microdnf clean all && \
4343
# Verify tool versions and install locations.
4444
echo "Verifying python install" && \

naev-linux-lts/Dockerfile.amd64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN yum -y install epel-release && \
2121
libunibreak-devel luajit-devel openal-soft-devel openblas-devel pcre2-devel SDL2-devel \
2222
SDL2_image-devel \
2323
# Install utilities
24-
git nano tar xz unzip zip && \
24+
git nano tar texinfo xz unzip zip && \
2525
yum clean all && \
2626
# Install pyyaml
2727
python3 -m pip install PyYAML && \

naev-macos/Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ENV HOST "aarch64-apple-darwin20.1"
8383
ENV APPIMAGE_EXTRACT_AND_RUN 1
8484

8585
# Install build tools.
86-
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 && \
86+
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 && \
8787
microdnf clean all && \
8888
# 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.)
8989
python3 -m pip install git+https://github.com/mesonbuild/meson.git@ec388fe7c2b93879499ad782c2da41ec22d003b2 && \

naev-macos/Dockerfile.amd64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM registry.fedoraproject.org/fedora-minimal:latest AS build
33

44
# Install Build dependencies and utilities.
55
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install bzip2 clang cmake git file findutils patch python3 \
6-
openssl openssl-devel xz-devel libxml2-devel llvm-devel uuid-devel unzip tar xz zlib-devel && \
6+
openssl openssl-devel xz-devel libxml2-devel llvm-devel uuid-devel unzip tar texinfo xz zlib-devel && \
77
microdnf clean all && \
88
# Verify tool / language versions versions.
99
echo "Verifying clang install" && \

naev-steamruntime/Dockerfile.amd64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ ENV IMAGE_NAME "naev-steamruntime"
99

1010
# Install pip from steam/debian repositories.
1111
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip \
12-
# 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.
13-
libopenblas-dev libwebp-dev libpcre2-dev && \
12+
# 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.
13+
libopenblas-dev libwebp-dev libpcre2-dev texinfo && \
1414
apt-get clean && \
1515
# Upgrade meson via pip.
1616
python3 -m pip install meson --upgrade && \

naev-windows/Dockerfile.amd64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ENV IMAGE_NAME "naev-windows"
99

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

0 commit comments

Comments
 (0)