From 046ab053e89e43cf6de45086d314ec2d1b00183c Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Sat, 9 May 2020 00:27:30 +0200 Subject: [PATCH] Make early-built parts shareable whether system GCC is used or not Currently, we could just list gettext but for maintainability, it's easier to compare the list with only python&gcc's buildout.cfg --- component/defaults.cfg | 7 +++++++ component/python3/buildout.cfg | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/component/defaults.cfg b/component/defaults.cfg index 5620134ef0..4105744a18 100644 --- a/component/defaults.cfg +++ b/component/defaults.cfg @@ -1,5 +1,6 @@ [buildout] extends = + gcc/buildout.cfg python-2.7/buildout.cfg python3/buildout.cfg python = python @@ -25,6 +26,12 @@ update = depends = ${gcc:recipe} [gcc] +depends = +# requirements that are common to gcc & python + ${gettext:recipe} + ${perl:recipe} +# python requirements for which the compiler does not matter + ${patch:recipe} recipe = slapos.recipe.build # Latest version provided by SlapOS. part = gcc-8.2 diff --git a/component/python3/buildout.cfg b/component/python3/buildout.cfg index 05063fe295..f9aede7259 100644 --- a/component/python3/buildout.cfg +++ b/component/python3/buildout.cfg @@ -12,7 +12,6 @@ extends = ../patch/buildout.cfg ../readline/buildout.cfg ../sqlite3/buildout.cfg - ../gcc/buildout.cfg ../xz-utils/buildout.cfg ../zlib/buildout.cfg -- 2.30.9