diff options
Diffstat (limited to 'poky/meta/classes/meson.bbclass')
-rw-r--r-- | poky/meta/classes/meson.bbclass | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/poky/meta/classes/meson.bbclass b/poky/meta/classes/meson.bbclass index 0bfe945811..546cd0476f 100644 --- a/poky/meta/classes/meson.bbclass +++ b/poky/meta/classes/meson.bbclass @@ -59,6 +59,7 @@ do_write_config() { [binaries] c = ${@meson_array('CC', d)} cpp = ${@meson_array('CXX', d)} +cython = 'cython3' ar = ${@meson_array('AR', d)} nm = ${@meson_array('NM', d)} strip = ${@meson_array('STRIP', d)} @@ -98,6 +99,7 @@ EOF [binaries] c = ${@meson_array('BUILD_CC', d)} cpp = ${@meson_array('BUILD_CXX', d)} +cython = 'cython3' ar = ${@meson_array('BUILD_AR', d)} nm = ${@meson_array('BUILD_NM', d)} strip = ${@meson_array('BUILD_STRIP', d)} @@ -140,16 +142,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" |