summaryrefslogtreecommitdiffstats
path: root/meta/classes/meson.bbclass
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-01-24 11:17:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-27 16:48:09 +0000
commit4821e629efe0ec86cef32d326c2fc5ab6515d2f6 (patch)
tree455761d449c96cd312e417fbfbeac06be77ea28d /meta/classes/meson.bbclass
parent22dd46cc34629d0750177fddff2e1c178c854340 (diff)
downloadpoky-4821e629efe0ec86cef32d326c2fc5ab6515d2f6.tar.gz
meson: update 0.52.1 -> 0.53.0
Unset LD, and do not set ld in cross file from LD as new version of meson passes that value directly to -fuse-ld=... which requires one of lld, bfd, gold. (From OE-Core rev: e0e30637a139feb744ca284aa63d47efefc5cb5d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/meson.bbclass')
-rw-r--r--meta/classes/meson.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 9c3673ea42..001602bd04 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -91,7 +91,6 @@ c = ${@meson_array('CC', d)}
91cpp = ${@meson_array('CXX', d)} 91cpp = ${@meson_array('CXX', d)}
92ar = ${@meson_array('AR', d)} 92ar = ${@meson_array('AR', d)}
93nm = ${@meson_array('NM', d)} 93nm = ${@meson_array('NM', d)}
94ld = ${@meson_array('LD', d)}
95strip = ${@meson_array('STRIP', d)} 94strip = ${@meson_array('STRIP', d)}
96readelf = ${@meson_array('READELF', d)} 95readelf = ${@meson_array('READELF', d)}
97pkgconfig = 'pkg-config' 96pkgconfig = 'pkg-config'
@@ -122,6 +121,10 @@ EOF
122CONFIGURE_FILES = "meson.build" 121CONFIGURE_FILES = "meson.build"
123 122
124meson_do_configure() { 123meson_do_configure() {
124 # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards
125 # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
126 unset LD
127
125 # Work around "Meson fails if /tmp is mounted with noexec #2972" 128 # Work around "Meson fails if /tmp is mounted with noexec #2972"
126 mkdir -p "${B}/meson-private/tmp" 129 mkdir -p "${B}/meson-private/tmp"
127 export TMPDIR="${B}/meson-private/tmp" 130 export TMPDIR="${B}/meson-private/tmp"