From: Petri Latvala <petri.latvala@intel.com>
To: Guillaume Tucker <guillaume.tucker@collabora.com>
Cc: igt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Subject: Re: [igt-dev] [PATCH i-g-t v2 2/4] gitlab-ci: add libatomic to docker images
Date: Fri, 14 Jun 2019 13:00:34 +0300 [thread overview]
Message-ID: <20190614100034.GN22949@platvala-desk.ger.corp.intel.com> (raw)
In-Reply-To: <d23e7d953526d4f2e569d375523829f21091255d.1560433744.git.guillaume.tucker@collabora.com>
On Thu, Jun 13, 2019 at 02:53:20PM +0100, Guillaume Tucker wrote:
> Add libatomic to the Fedora docker image so it can link binaries that
> use __atomic_* functions. Also explicitly add libatomic1 to Debian
> docker images even though it's already installed as a dependency.
>
> Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
> ---
> Dockerfile.debian | 1 +
> Dockerfile.debian-arm64 | 1 +
> Dockerfile.debian-armhf | 1 +
> Dockerfile.fedora | 2 +-
> 4 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/Dockerfile.debian b/Dockerfile.debian
> index b9c3be3945e0..d23591850c4e 100644
> --- a/Dockerfile.debian
> +++ b/Dockerfile.debian
> @@ -6,6 +6,7 @@ RUN apt-get install -y \
> flex \
> bison \
> pkg-config \
> + libatomic1 \
> libpciaccess-dev \
> libkmod-dev \
> libprocps-dev \
> diff --git a/Dockerfile.debian-arm64 b/Dockerfile.debian-arm64
> index 7b3a3c7ca803..003bb22b3215 100644
> --- a/Dockerfile.debian-arm64
> +++ b/Dockerfile.debian-arm64
> @@ -5,6 +5,7 @@ RUN apt-get install -y \
> flex \
> bison \
> pkg-config \
> + libatomic1 \
> x11proto-dri2-dev \
> python-docutils \
> valgrind \
> diff --git a/Dockerfile.debian-armhf b/Dockerfile.debian-armhf
> index c67a1e2acf6a..3139927c193a 100644
> --- a/Dockerfile.debian-armhf
> +++ b/Dockerfile.debian-armhf
> @@ -5,6 +5,7 @@ RUN apt-get install -y \
> flex \
> bison \
> pkg-config \
> + libatomic1 \
libatomic1 is the runtime lib, for linking you need the package that
contains libatomic.so. That is *quick search*
libgcc-$version-dev. There doesn't seem to be a generic metapackage
for "the latest libgcc-dev", other than... 'gcc'.
Since Debian is acting a bit speshul here I'd just drop the explicit
libatomic installation.
> x11proto-dri2-dev \
> python-docutils \
> valgrind \
> diff --git a/Dockerfile.fedora b/Dockerfile.fedora
> index 6686e587613d..c84b412b0723 100644
> --- a/Dockerfile.fedora
> +++ b/Dockerfile.fedora
> @@ -1,7 +1,7 @@
> FROM fedora:30
>
> RUN dnf install -y \
> - gcc flex bison meson ninja-build xdotool \
> + gcc flex bison libatomic meson ninja-build xdotool \
Possibly the same comment on fedora but I'm not aware of how they
split their gcc package. Anyway, the file to check for is
'libatomic.so'.
--
Petri Latvala
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-06-14 10:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 13:53 [igt-dev] [PATCH i-g-t v2 0/4] Use C11 atomics Guillaume Tucker
2019-06-13 13:53 ` [Intel-gfx] [PATCH i-g-t v2 1/4] meson: add libatomic dependency Guillaume Tucker
2019-06-14 8:07 ` [igt-dev] " Ser, Simon
2019-06-18 8:33 ` Guillaume Tucker
2019-06-18 13:11 ` Ser, Simon
2019-06-13 13:53 ` [igt-dev] [PATCH i-g-t v2 2/4] gitlab-ci: add libatomic to docker images Guillaume Tucker
2019-06-14 8:08 ` Ser, Simon
2019-06-14 10:00 ` Petri Latvala [this message]
2019-06-14 11:24 ` Ser, Simon
2019-06-14 12:43 ` Petri Latvala
2019-06-14 12:53 ` [Intel-gfx] " Ser, Simon
2019-06-18 8:42 ` Guillaume Tucker
2019-06-13 13:53 ` [igt-dev] [PATCH i-g-t v2 3/4] i915/gem_create: use atomic_* instead of __sync_* Guillaume Tucker
2019-06-14 8:11 ` Ser, Simon
2019-06-13 13:53 ` [Intel-gfx] [PATCH i-g-t v2 4/4] tests/sw_sync: " Guillaume Tucker
2019-06-14 8:12 ` [igt-dev] " Ser, Simon
2019-06-13 16:33 ` [igt-dev] ✓ Fi.CI.BAT: success for Use C11 atomics Patchwork
2019-06-15 5:16 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190614100034.GN22949@platvala-desk.ger.corp.intel.com \
--to=petri.latvala@intel.com \
--cc=guillaume.tucker@collabora.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox