Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install cargo-c #40

Closed
wants to merge 3 commits into from
Closed

Install cargo-c #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40f9c8b
WIP
TingPing Sep 3, 2024
b566fc3
Attempt to fix
dpino Sep 3, 2024
3cac525
Remove unnecessary line
dpino Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions images/wkdev_sdk/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,19 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.s
rm -rf WebKit && \
${APT_AUTOREMOVE}

# Add Rust environment.
ENV RUSTUP_HOME="/opt/rust" \
CARGO_HOME="/opt/rust" \
PATH="/root/.cargo/bin:${PATH}"

# Install any necessary rust projects
# The Ubuntu provided sccache 0.7.7 package is broken
# Building GStreamer needs cargo-c
RUN rustup toolchain install 1.78 && \
cargo install --root /usr/local --version 0.8.1 --locked sccache && \
cargo install --root /usr/local cargo-c && \
rm -rf ~/.cargo

# Copy jhbuild helper files and do the initial build & install
COPY /jhbuild/jhbuildrc /etc/xdg/jhbuildrc
COPY /jhbuild/webkit-sdk-deps.modules /jhbuild/webkit-sdk-deps.modules
Expand Down Expand Up @@ -127,8 +140,5 @@ RUN export QT_VERSION=$(qmake6 -query QT_VERSION) && \
ln -s ${directory} ${directory}/${QT_VERSION} >/dev/null 2>&1 || true; \
done

# Build custom sccache version (the Ubuntu provided 0.7.7 package is broken)
RUN cargo install --root /usr/local --version 0.8.1 --locked sccache

# Switch back to interactive prompt, when using apt.
ENV DEBIAN_FRONTEND dialog
2 changes: 1 addition & 1 deletion images/wkdev_sdk/required_system_packages/04-devtools.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
build-essential cmake ninja-build

# Build tools
icecc ccache cargo
icecc ccache rustup

# Debugging / profiling / tracing
valgrind rr perf-tools-unstable systemd-coredump
Expand Down
Loading