Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-02-11 03:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

common: bump binaryen, wabt to latest

Browse Source 
Also fix ENV deprecated syntax.
This commit is contained in:
Matt McCormick 2024-12-23 07:22:53 -05:00
parent e2bc513d3f
commit a5a1cc9287
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/common.label-and-env
View File

@ -11,4 +11,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION} ENV DEFAULT_DOCKCROSS_IMAGE=${IMAGE}:${VERSION}

25
common/common.webassembly
View File

@ -2,8 +2,8 @@
# #
# Common WebAssembly tools. # Common WebAssembly tools.
# main 2024-04-02 # 2024-12, version 121
ENV BINARYEN_GIT_TAG 4e2ebbd6de6f99e5972654b3f50ddbc1c6839a73 ENV BINARYEN_GIT_TAG=353b759b230dff8fb82aeb157aeb6db360d74a49
RUN git clone --recursive https://github.com/WebAssembly/binaryen.git && \ RUN git clone --recursive https://github.com/WebAssembly/binaryen.git && \
cd binaryen && \ cd binaryen && \
git checkout ${BINARYEN_GIT_TAG} && \ git checkout ${BINARYEN_GIT_TAG} && \
@ -14,6 +14,7 @@ RUN git clone --recursive https://github.com/WebAssembly/binaryen.git && \
-DCMAKE_C_COMPILER=/usr/bin/cc \ -DCMAKE_C_COMPILER=/usr/bin/cc \
-DCMAKE_CXX_COMPILER=/usr/bin/c++ \ -DCMAKE_CXX_COMPILER=/usr/bin/c++ \
-G Ninja \ -G Ninja \
-DENABLE_WERROR:BOOL=OFF \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_TOOLCHAIN_FILE="" \ -DCMAKE_TOOLCHAIN_FILE="" \
../binaryen && \ ../binaryen && \
@ -22,8 +23,8 @@ RUN git clone --recursive https://github.com/WebAssembly/binaryen.git && \
cd ../ && \ cd ../ && \
rm -rf binaryen* rm -rf binaryen*
# main 2024-04-02 # main 2024-12-23
ENV WABT_GIT_TAG 356931a867c7d642bc282fff46a1c95ab0e843f3 ENV WABT_GIT_TAG=ea193b40d6d4a1a697d68ae855b2b3b3e263b377
RUN git clone --recurse-submodules https://github.com/WebAssembly/wabt.git && \ RUN git clone --recurse-submodules https://github.com/WebAssembly/wabt.git && \
cd wabt && \ cd wabt && \
git checkout ${WABT_GIT_TAG} && \ git checkout ${WABT_GIT_TAG} && \
@ -44,11 +45,11 @@ RUN git clone --recurse-submodules https://github.com/WebAssembly/wabt.git && \
RUN mkdir /wasi-runtimes RUN mkdir /wasi-runtimes
ENV WASMTIME_HOME /wasi-runtimes/wasmtime ENV WASMTIME_HOME=/wasi-runtimes/wasmtime
RUN mkdir ${WASMTIME_HOME} && curl https://wasmtime.dev/install.sh -sSf | bash RUN mkdir ${WASMTIME_HOME} && curl https://wasmtime.dev/install.sh -sSf | bash
COPY imagefiles/wasmtime-pwd.sh ${WASMTIME_HOME}/bin/ COPY imagefiles/wasmtime-pwd.sh ${WASMTIME_HOME}/bin/
COPY imagefiles/wasmtime-pwd-threads.sh ${WASMTIME_HOME}/bin/ COPY imagefiles/wasmtime-pwd-threads.sh ${WASMTIME_HOME}/bin/
ENV PATH "$WASMTIME_HOME/bin:$PATH" ENV PATH="$WASMTIME_HOME/bin:$PATH"
# For wasmer # For wasmer
RUN \ RUN \
@ -56,20 +57,20 @@ RUN \
apt-get install --no-install-recommends --yes \ apt-get install --no-install-recommends --yes \
libxkbcommon0 libxkbcommon0
ENV WASMER_DIR /wasi-runtimes/wasmer ENV WASMER_DIR=/wasi-runtimes/wasmer
RUN curl https://get.wasmer.io -sSfL | sh RUN curl https://get.wasmer.io -sSfL | sh
COPY imagefiles/wasmer-pwd.sh ${WASMER_DIR}/bin/ COPY imagefiles/wasmer-pwd.sh ${WASMER_DIR}/bin/
ENV PATH "$WASMER_DIR/bin:$PATH" ENV PATH="$WASMER_DIR/bin:$PATH"
ENV WASM3_VERSION 0.5.0 ENV WASM3_VERSION=0.5.0
RUN mkdir -p /wasi-runtimes/wasm3/bin && \ RUN mkdir -p /wasi-runtimes/wasm3/bin && \
curl -LO https://github.com/wasm3/wasm3/releases/download/v${WASM3_VERSION}/wasm3-linux-x64.elf && \ curl -LO https://github.com/wasm3/wasm3/releases/download/v${WASM3_VERSION}/wasm3-linux-x64.elf && \
mv wasm3-linux-x64.elf /wasi-runtimes/wasm3/bin/wasm3 && \ mv wasm3-linux-x64.elf /wasi-runtimes/wasm3/bin/wasm3 && \
chmod +x /wasi-runtimes/wasm3/bin/wasm3 chmod +x /wasi-runtimes/wasm3/bin/wasm3
ENV PATH "/wasi-runtimes/wasm3/bin:$PATH" ENV PATH="/wasi-runtimes/wasm3/bin:$PATH"
ENV WAVM_VERSION 2022-05-14 ENV WAVM_VERSION=2022-05-14
RUN mkdir -p /wasi-runtimes/wavm/ && \ RUN mkdir -p /wasi-runtimes/wavm/ && \
curl -LO https://github.com/WAVM/WAVM/releases/download/nightly%2F${WAVM_VERSION}/wavm-0.0.0-prerelease-linux.tar.gz && \ curl -LO https://github.com/WAVM/WAVM/releases/download/nightly%2F${WAVM_VERSION}/wavm-0.0.0-prerelease-linux.tar.gz && \
tar -xv -C /wasi-runtimes/wavm/ -f wavm-0.0.0-prerelease-linux.tar.gz tar -xv -C /wasi-runtimes/wavm/ -f wavm-0.0.0-prerelease-linux.tar.gz
ENV PATH "/wasi-runtimes/wavm/bin:$PATH" ENV PATH="/wasi-runtimes/wavm/bin:$PATH"