diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/meson.bbclass | 10 |
1 files changed, 0 insertions, 10 deletions
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() { | |||
140 | # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3 | 140 | # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3 |
141 | unset LD | 141 | unset LD |
142 | 142 | ||
143 | # sstate.bbclass no longer removes empty directories to avoid a race (see | ||
144 | # commit 4f94d929 "sstate/staging: Handle directory creation race issue"). | ||
145 | # Unfortunately Python apparently treats an empty egg-info directory as if | ||
146 | # the version it previously contained still exists and fails if a newer | ||
147 | # version is required, which Meson does. To avoid this, make sure there are | ||
148 | # no empty egg-info directories from previous versions left behind. Ignore | ||
149 | # all errors from rmdir since the egg-info may be a file rather than a | ||
150 | # directory. | ||
151 | rmdir ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/*.egg-info 2>/dev/null || : | ||
152 | |||
153 | # Work around "Meson fails if /tmp is mounted with noexec #2972" | 143 | # Work around "Meson fails if /tmp is mounted with noexec #2972" |
154 | mkdir -p "${B}/meson-private/tmp" | 144 | mkdir -p "${B}/meson-private/tmp" |
155 | export TMPDIR="${B}/meson-private/tmp" | 145 | export TMPDIR="${B}/meson-private/tmp" |