godotengine/build-containers
1
0
Fork 0
mirror of https://github.com/godotengine/build-containers.git synced 2025-12-31 21:48:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Set base to Fedora 35 for now, F36 still a bit too new

Browse Source 
Notably LLVM 14 on F36 doesn't seem to play nice with macOS builds.
We probably need to wait for Xcode 14 to have support for LLVM 14.

Going back to F35 also avoids issues with autoconf 2.71.
This commit is contained in:
Rémi Verschelde
2022-05-13 15:11:06 +02:00
parent 232fa5de5d
commit 6cfd2d060a
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.base
View File

@@ -1,4 +1,4 @@
FROM fedora:36
FROM fedora:35
WORKDIR /root

4
Dockerfile.javascript
View File

@@ -7,10 +7,6 @@ ENV EMSCRIPTEN_CLASSICAL=3.1.10
ENV EMSCRIPTEN_MONO=1.39.9
RUN if [ -z "${mono_version}" ]; then printf "\n\nArgument mono_version is mandatory!\n\n"; exit 1; fi && \
# We need to downgrade to autoconf 2.69 from F35 as autoconf 2.71 from F36 breaks `--host wasm32`.
dnf -y install --setopt=install_weak_deps=False \
https://kojipkgs.fedoraproject.org//packages/autoconf/2.69/37.fc35/noarch/autoconf-2.69-37.fc35.noarch.rpm \
https://kojipkgs.fedoraproject.org//packages/automake/1.16.2/5.fc35/noarch/automake-1.16.2-5.fc35.noarch.rpm && \
git clone --branch ${EMSCRIPTEN_CLASSICAL} --progress https://github.com/emscripten-core/emsdk emsdk_${EMSCRIPTEN_CLASSICAL} && \
cp -r emsdk_${EMSCRIPTEN_CLASSICAL} emsdk_${EMSCRIPTEN_MONO} && \
emsdk_${EMSCRIPTEN_CLASSICAL}/emsdk install ${EMSCRIPTEN_CLASSICAL} && \