]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
meson: use pkg-config in the cross files
authorRoss Burton <ross.burton@arm.com>
Wed, 10 Jan 2024 13:42:02 +0000 (13:42 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 12 Jan 2024 11:51:18 +0000 (11:51 +0000)
>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

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes-recipe/meson.bbclass

index a85d120d77f114dab5cdf9e40b86ebef62f950a3..33043231b4855e6964593fe8eb88b77a4c760f4d 100644 (file)
@@ -74,7 +74,7 @@ nm = ${@meson_array('NM', d)}
 strip = ${@meson_array('STRIP', d)}
 readelf = ${@meson_array('READELF', d)}
 objcopy = ${@meson_array('OBJCOPY', d)}
-pkgconfig = 'pkg-config'
+pkg-config = 'pkg-config'
 llvm-config = 'llvm-config'
 cups-config = 'cups-config'
 g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
@@ -115,7 +115,7 @@ strip = ${@meson_array('BUILD_STRIP', d)}
 readelf = ${@meson_array('BUILD_READELF', d)}
 objcopy = ${@meson_array('BUILD_OBJCOPY', d)}
 llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config'
-pkgconfig = 'pkg-config-native'
+pkg-config = 'pkg-config-native'
 ${@rust_tool(d, "RUST_BUILD_SYS")}
 
 [built-in options]