Skip to content

Commit

Permalink
Pin to meson versions >=0.56,!=1.2.*
Browse files Browse the repository at this point in the history
Meson v1.2.* has a bug that prevents Gramine from building. Because the
meson bug is non-trivial, this commit works around this by pinning meson
to known good versions.

Signed-off-by: Dmitrii Kuvaiskii <dmitrii.kuvaiskii@intel.com>
  • Loading branch information
dimakuv committed Jul 18, 2023
1 parent 06e3a57 commit 4bf7976
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion templates/centos/Dockerfile.compile.template
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* &&\
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* &&\
sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/CentOS-Linux-PowerTools.repo

# NOTE: meson v1.2.* has a bug that leads to Gramine build failure because of not found `libcurl.a`
RUN dnf update -y \
&& dnf install -y \
autoconf \
Expand Down Expand Up @@ -35,6 +36,6 @@ RUN dnf update -y \
python3-protobuf \
rpm-build \
wget \
&& /usr/bin/python3 -B -m pip install 'tomli>=1.1.0' 'tomli-w>=0.4.0' 'meson>=0.56'
&& /usr/bin/python3 -B -m pip install 'tomli>=1.1.0' 'tomli-w>=0.4.0' 'meson>=0.56,!=1.2.*'

{% endblock %}
3 changes: 2 additions & 1 deletion templates/debian/Dockerfile.compile.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends "Dockerfile.common.compile.template" %}

# NOTE: meson v1.2.* has a bug that leads to Gramine build failure because of not found `libcurl.a`
{% block install %}
RUN env DEBIAN_FRONTEND=noninteractive apt-get update \
&& env DEBIAN_FRONTEND=noninteractive apt-get install -y \
Expand All @@ -22,7 +23,7 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get update \
python3-pip \
python3-protobuf \
wget \
&& /usr/bin/python3 -B -m pip install 'tomli>=1.1.0' 'tomli-w>=0.4.0' 'meson>=0.56'
&& /usr/bin/python3 -B -m pip install 'tomli>=1.1.0' 'tomli-w>=0.4.0' 'meson>=0.56,!=1.2.*'

COPY intel-sgx-deb.key /

Expand Down

0 comments on commit 4bf7976

Please sign in to comment.