From 3ab62518a83793b4154f8302058a1e25570a250b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 May 2022 17:24:40 +0100 Subject: Revert "meson.bblcass: Remove empty egg-info directories before running meson" This reverts commit 47d9d90b4ec7d04d6f3f1a9b97c0ab7f1264a88e. This is no longer needed with a patch to fix importlib in python. Signed-off-by: Richard Purdie --- meta/classes/meson.bbclass | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 0bfe945811..b265e6659f 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -140,16 +140,6 @@ meson_do_configure() { # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3 unset LD - # sstate.bbclass no longer removes empty directories to avoid a race (see - # commit 4f94d929 "sstate/staging: Handle directory creation race issue"). - # Unfortunately Python apparently treats an empty egg-info directory as if - # the version it previously contained still exists and fails if a newer - # version is required, which Meson does. To avoid this, make sure there are - # no empty egg-info directories from previous versions left behind. Ignore - # all errors from rmdir since the egg-info may be a file rather than a - # directory. - rmdir ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/*.egg-info 2>/dev/null || : - # Work around "Meson fails if /tmp is mounted with noexec #2972" mkdir -p "${B}/meson-private/tmp" export TMPDIR="${B}/meson-private/tmp" -- cgit v1.2.3-54-g00ecf