Do the v1.6.1 change without bungling naev-macos/Dockerfile.amd64.

naev · Aug 10, 2022 · 7980296 · 7980296
1 parent 80cc4ee
commit 7980296
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.2
+Do the v1.6.1 change without bungling naev-macos/Dockerfile.amd64.
+
 ### v1.6.1
 Added texinfo to the build images, accidentally needed to build libbfd for CI.
 

diff --git a/naev-macos/Dockerfile.aarch64 b/naev-macos/Dockerfile.aarch64
@@ -91,6 +91,7 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettex
     echo "Verifying meson install" && \
     command -v meson && \
     meson --version && \
+    echo "Verifying dmg install" && \
     command -v dmg && \
 # Horrible hack: ensure a hardcoded header file path resolves.  
     rmdir /opt && ln -s /usr/lib/osxcross/macports/pkgs/opt /opt && \

diff --git a/naev-macos/Dockerfile.amd64 b/naev-macos/Dockerfile.amd64
@@ -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 texinfo xz zlib-devel && \
+    openssl openssl-devel xz-devel libxml2-devel llvm-devel uuid-devel unzip tar xz zlib-devel && \
     microdnf clean all && \
 # Verify tool / language versions versions.
     echo "Verifying clang install" && \
@@ -82,7 +82,7 @@ ENV HOST "x86_64-apple-darwin17"
 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 && \