summaryrefslogtreecommitdiffstats
path: root/meta/classes-recipe
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2024-02-09 12:30:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-15 09:29:15 +0000
commit746bebb8dd61f7042bf583dcbca168fefebc6c75 (patch)
tree09eddf84cb7a796323c08f1a7e30821ebc63fef5 /meta/classes-recipe
parent3a5e5742fcf85d34f4220b7705290c6d4bc7800c (diff)
downloadpoky-746bebb8dd61f7042bf583dcbca168fefebc6c75.tar.gz
meson: remove TMPDIR workaround
We had to export TMPDIR because Meson was writing temporary files into /tmp and then trying to run them, but some systems had /tmp mounted noexec. This is now solved upstream as of meson commit 1e182b5 (which was part of Meson 0.52.0), and these temporary files are written to the build tree instead. (From OE-Core rev: 1809d20f92dc0e4eff19cf081ca78a9f30deb611) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
-rw-r--r--meta/classes-recipe/meson.bbclass3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass
index 33043231b4..a849e87297 100644
--- a/meta/classes-recipe/meson.bbclass
+++ b/meta/classes-recipe/meson.bbclass
@@ -152,9 +152,6 @@ meson_do_configure() {
152 # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3 152 # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
153 unset LD 153 unset LD
154 154
155 # Work around "Meson fails if /tmp is mounted with noexec #2972"
156 mkdir -p "${B}/meson-private/tmp"
157 export TMPDIR="${B}/meson-private/tmp"
158 bbnote Executing meson ${EXTRA_OEMESON}... 155 bbnote Executing meson ${EXTRA_OEMESON}...
159 if ! meson setup ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then 156 if ! meson setup ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then
160 bbfatal_log meson failed 157 bbfatal_log meson failed