diff options
| -rw-r--r-- | .devcontainer/Dockerfile | 14 | ||||
| -rw-r--r-- | contrib/depends/packages/native_mrustc.mk | 12 |
2 files changed, 18 insertions, 8 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b593317..41a8e5f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -9,9 +9,16 @@ SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"] RUN apt update \ - && apt install -y pigz wget build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 libtinfo6 gperf gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-i686 build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 gperf unzip python-is-python3 build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 gperf gcc-aarch64-linux-gnu g++-aarch64-linux-gnu gcc-i686-linux-gnu g++-i686-linux-gnu pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 gperf python-is-python3 zsh llvm libclang1-18 libc++-18-dev clang zlib1g-dev + && apt install -y sudo pigz wget build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 libtinfo6 gperf unzip python-is-python3 zsh llvm libclang1-18 libc++-18-dev clang zlib1g-dev -RUN bash -c 'if [[ "$(uname -m)" == "aarch64" || "$(uname -m)" == "arm64" ]] then sudo rm -rf /opt/android-sdk-linux/platform-tools; fi' +# Install architecture-specific packages +RUN if [[ "$(uname -m)" == "x86_64" || "$(uname -m)" == "amd64" ]]; then \ + apt install -y gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-i686 gcc-aarch64-linux-gnu g++-aarch64-linux-gnu gcc-i686-linux-gnu g++-i686-linux-gnu; \ + elif [[ "$(uname -m)" == "aarch64" || "$(uname -m)" == "arm64" ]]; then \ + apt install -y gcc-x86-64-linux-gnu g++-x86-64-linux-gnu gcc-i686-linux-gnu g++-i686-linux-gnu; \ + fi + +RUN bash -c 'if [[ "$(uname -m)" == "aarch64" || "$(uname -m)" == "arm64" ]] then rm -rf /opt/android-sdk-linux/platform-tools; fi' ENV DENO_VERSION=v2.0.3 @@ -23,6 +30,9 @@ RUN if [[ "$(uname -m)" == "aarch64" || "$(uname -m)" == "arm64" ]] then export mv deno /usr/local/bin && \ rm -rf deno deno.zip +RUN apt install -y sudo && \ + echo "ubuntu ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/ubuntu + USER ubuntu RUN git config --global --add safe.directory '*' diff --git a/contrib/depends/packages/native_mrustc.mk b/contrib/depends/packages/native_mrustc.mk index 3fe49cd..86bdf42 100644 --- a/contrib/depends/packages/native_mrustc.mk +++ b/contrib/depends/packages/native_mrustc.mk @@ -1,9 +1,9 @@ package=native_mrustc -$(package)_version=0.11 +$(package)_version=0.11.0 $(package)_download_path=https://github.com/thepowersgang/mrustc/archive -$(package)_download_file=b6754f574f8846eb842feba4ccbeeecb10bdfacc.tar.gz +$(package)_download_file=44013560b99ee8f351807d5ad4b64ba36bfe7d01.tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=4b006089cf770fd31971ac93d690bf485483a4a309460a6ef41fa64cf1f87649 +$(package)_sha256_hash=a723f4f0fd63d0950ca6f8d0dcaf35fb1f34d5c683e552d44c7553ffdb57a343 $(package)_dependencies=native_ccache define $(package)_set_vars @@ -31,9 +31,9 @@ define $(package)_build_cmds endef define $(package)_stage_cmds - mkdir -p $($(package)_staging_dir)/native/bin $($(package)_staging_dir)/native/lib && \ - cp bin/mrustc bin/minicargo $($(package)_staging_dir)/native/bin && \ - cp -r output-1.54.0 $($(package)_staging_dir)/native/lib + mkdir -p $($(package)_staging_dir)/$(host_prefix)/native/bin $($(package)_staging_dir)/$(host_prefix)/native/lib && \ + cp bin/mrustc bin/minicargo $($(package)_staging_dir)/$(host_prefix)/native/bin && \ + cp -r output-1.54.0 $($(package)_staging_dir)/$(host_prefix)/native endef define $(package)_postprocess_cmds |