aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marvin Schmidt <marv@exherbo.org> 2019-05-13 07:10:58 +0200
committerAvatar Marvin Schmidt <marv@exherbo.org> 2019-10-13 15:23:46 +0200
commit64788783a4995d2766d409e3a56e52eaec4c7f64 (patch)
tree8141f24182f78973a3c7d3f8a6af6b10d94d8726
parent796f728788b6e302ab301f1ac4b2bf82778a8daf (diff)
downloadpaludis-64788783a4995d2766d409e3a56e52eaec4c7f64.tar.gz
paludis-64788783a4995d2766d409e3a56e52eaec4c7f64.tar.xz
ci: gentoo: Workaround boost/cmake problems
-rw-r--r--ci/docker/gentoo/paludis-gentoo/Dockerfile6
-rw-r--r--ci/docker/gentoo/paludis-gentoo/config/package.accept_keywords8
-rw-r--r--ci/docker/gentoo/paludis-gentoo/config/package.mask2
3 files changed, 9 insertions, 7 deletions
diff --git a/ci/docker/gentoo/paludis-gentoo/Dockerfile b/ci/docker/gentoo/paludis-gentoo/Dockerfile
index 66da61119..0f1ef0776 100644
--- a/ci/docker/gentoo/paludis-gentoo/Dockerfile
+++ b/ci/docker/gentoo/paludis-gentoo/Dockerfile
@@ -9,7 +9,11 @@ COPY ./config/package.mask /etc/portage/
COPY ./config/package.accept_keywords /etc/portage/
COPY ./config/sets/paludis-deps /etc/portage/sets/
-RUN emerge --update --newuse --deep -v @world \
+RUN sed -e '/--no-cmake-config/d' \
+ -i /var/db/repos/gentoo/dev-libs/boost/boost-1.71.0.ebuild \
+ && cd /var/db/repos/gentoo/dev-libs/boost \
+ && ebuild --force boost-1.71.0.ebuild manifest \
+ && emerge --update --newuse --deep -v @world \
&& emerge --update --newuse --deep -v @paludis-deps \
&& rm -rf /var/db/repos/*
diff --git a/ci/docker/gentoo/paludis-gentoo/config/package.accept_keywords b/ci/docker/gentoo/paludis-gentoo/config/package.accept_keywords
index a0be4ae36..0de75ec24 100644
--- a/ci/docker/gentoo/paludis-gentoo/config/package.accept_keywords
+++ b/ci/docker/gentoo/paludis-gentoo/config/package.accept_keywords
@@ -7,8 +7,6 @@
# required by @world (argument)
=dev-libs/openssl-1.0.2o-r6 ~amd64
-# required by dev-libs/boost-1.66.0::gentoo
-# required by =dev-libs/boost-1.66.0 (argument)
-=dev-util/boost-build-1.66.0 **
-# required by =dev-libs/boost-1.66.0 (argument)
-=dev-libs/boost-1.66.0 **
+=dev-util/boost-build-1.71.0 **
+=dev-libs/boost-1.71.0 **
+=dev-util/cmake-3.15.3 **
diff --git a/ci/docker/gentoo/paludis-gentoo/config/package.mask b/ci/docker/gentoo/paludis-gentoo/config/package.mask
index 1e5cf13ad..8b1378917 100644
--- a/ci/docker/gentoo/paludis-gentoo/config/package.mask
+++ b/ci/docker/gentoo/paludis-gentoo/config/package.mask
@@ -1 +1 @@
->=dev-libs/boost-1.65
+