[librsvg-oci-images] Add cargo-c to all images
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg-oci-images] Add cargo-c to all images
- Date: Thu, 1 Oct 2020 15:53:38 +0000 (UTC)
commit 5e8a5cc884ed5c02c95861348a066251e3049535
Author: Sven Neumann <sven svenfoo org>
Date: Mon Sep 21 12:38:01 2020 +0200
Add cargo-c to all images
It can be installed from package on opensuse and fedora.
Build and install it by means of cargo on debian and ubuntu. This
is untested as these images are currently disabled.
Closes #2
debian/prepare.sh | 6 ++++--
fedora/latest | 4 +++-
opensuse/tumbleweed | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/debian/prepare.sh b/debian/prepare.sh
index 35c9fb6..0e878d1 100644
--- a/debian/prepare.sh
+++ b/debian/prepare.sh
@@ -7,5 +7,7 @@ apt install -yqq --no-install-recommends \
libgdk-pixbuf2.0-dev libgirepository1.0-dev \
gtk-doc-tools git libgtk-3-dev ccache \
libxml2-dev libcroco3-dev libcairo2-dev \
- ca-certificates openssl autotools-dev \
- libltdl-dev autopoint
+ ca-certificates openssl openssl-dev \
+ autotools-dev libltdl-dev autopoint
+
+cargo install cargo-c
diff --git a/fedora/latest b/fedora/latest
index bdcf055..0d18559 100644
--- a/fedora/latest
+++ b/fedora/latest
@@ -7,7 +7,9 @@ RUN dnf upgrade -y && \
gtk-doc git redhat-rpm-config gtk3-devel ccache \
libxml2-devel libcroco-devel cairo-devel pango-devel \
gettext-devel && \
- dnf clean all
+ dnf install -y
https://kojipkgs.fedoraproject.org//packages/rust-cargo-c/0.5.2/3.fc32/x86_64/cargo-c-0.5.2-3.fc32.x86_64.rpm
+
+RUN dnf clean all
# Enable sudo for wheel users
RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' \
diff --git a/opensuse/tumbleweed b/opensuse/tumbleweed
index f6621d2..113a1fa 100644
--- a/opensuse/tumbleweed
+++ b/opensuse/tumbleweed
@@ -3,8 +3,8 @@ FROM opensuse/tumbleweed
ENV SHELL=/bin/bash
RUN zypper update -y && \
- zypper install -y gcc rust cargo clippy rustfmt \
- gdb rust-gdb rr make vala \
+ zypper install -y gcc rust cargo cargo-c \
+ clippy rustfmt gdb rust-gdb rr make vala \
automake autoconf libtool gettext itstool git \
gtk-doc gobject-introspection-devel gtk3-devel \
libxml2-devel libcroco-devel cairo-devel \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]