From b3f70a291e3aafcd7cfede79f294a6376d24f58d Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 18 Dec 2022 10:30:46 +0000 Subject: [PATCH] g-ir-scanner uses distutils functions. these are overridden by setuptools if setuptools is present (see site-packages/distutils-precedence.pth); enforce a dependency to avoid the case where setuptools might be removed mid-run, causing g-ir-scanner to fail. ok aja@, who reported sporadic build failures which must have been a result of this (I think it may relate to runtime patching of distutils function relating to the MSVC compiler). --- devel/gobject-introspection/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 6a6195fd7ec..3a0fadaa41a 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -2,7 +2,7 @@ COMMENT= GObject Introspection GNOME_VERSION= 1.74.0 GNOME_PROJECT= gobject-introspection -REVISION= 0 +REVISION= 1 CATEGORIES= devel @@ -31,6 +31,15 @@ RUN_DEPENDS= graphics/cairo \ textproc/py-markdown${MODPY_FLAVOR} \ www/py-mako${MODPY_FLAVOR} +# g-ir-scanner uses distutils functions. these are overridden by setuptools +# if setuptools is present (see site-packages/distutils-precedence.pth); +# enforce a dependency to avoid the case where setuptools might be removed +# mid-run, causing g-ir-scanner to fail. +# +# could be removed if/when gobject-introspection stops using distutils; +# see https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/395 +RUN_DEPENDS+= devel/py-setuptools${MODPY_FLAVOR} + # XXX: tests/scanner/test_transformer.py fails otherwise TEST_DEPENDS+= textproc/gsed