diff options
| author | Ross Burton <ross.burton@arm.com> | 2024-01-10 13:42:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-12 11:54:05 +0000 |
| commit | ac6fb1aa6a524e133422e6bb468122b07b9c87e9 (patch) | |
| tree | 3a45418ead59c3fb88fd59fbf024a79b9f4eab73 /meta/classes-recipe/meson.bbclass | |
| parent | 351737169a4be5ce2aab77ff30c89364fdcf5cf8 (diff) | |
| download | poky-ac6fb1aa6a524e133422e6bb468122b07b9c87e9.tar.gz | |
meson: use pkg-config in the cross files
>From Meson 1.3.0, the "pkgconfig" entry is deprecated and "pkg-config"
should be used instead[1].
[1] https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig
(From OE-Core rev: d64b307891422e290bbe821d4303b3af526bbe17)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe/meson.bbclass')
| -rw-r--r-- | meta/classes-recipe/meson.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index a85d120d77..33043231b4 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass | |||
| @@ -74,7 +74,7 @@ nm = ${@meson_array('NM', d)} | |||
| 74 | strip = ${@meson_array('STRIP', d)} | 74 | strip = ${@meson_array('STRIP', d)} |
| 75 | readelf = ${@meson_array('READELF', d)} | 75 | readelf = ${@meson_array('READELF', d)} |
| 76 | objcopy = ${@meson_array('OBJCOPY', d)} | 76 | objcopy = ${@meson_array('OBJCOPY', d)} |
| 77 | pkgconfig = 'pkg-config' | 77 | pkg-config = 'pkg-config' |
| 78 | llvm-config = 'llvm-config' | 78 | llvm-config = 'llvm-config' |
| 79 | cups-config = 'cups-config' | 79 | cups-config = 'cups-config' |
| 80 | g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' | 80 | g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper' |
| @@ -115,7 +115,7 @@ strip = ${@meson_array('BUILD_STRIP', d)} | |||
| 115 | readelf = ${@meson_array('BUILD_READELF', d)} | 115 | readelf = ${@meson_array('BUILD_READELF', d)} |
| 116 | objcopy = ${@meson_array('BUILD_OBJCOPY', d)} | 116 | objcopy = ${@meson_array('BUILD_OBJCOPY', d)} |
| 117 | llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config' | 117 | llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config' |
| 118 | pkgconfig = 'pkg-config-native' | 118 | pkg-config = 'pkg-config-native' |
| 119 | ${@rust_tool(d, "RUST_BUILD_SYS")} | 119 | ${@rust_tool(d, "RUST_BUILD_SYS")} |
| 120 | 120 | ||
| 121 | [built-in options] | 121 | [built-in options] |
