summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2024-05-20 10:18:30 +0000
committerSteve Sakoman <steve@sakoman.com>2024-07-17 05:36:14 -0700
commita92672a9fab99bfc18d0da3684947ea4432578e0 (patch)
tree956f2024898638afad247a23c636ff809da3b686
parent84103dbdb3b707733ac30daf7144b2ec402306f0 (diff)
downloadpoky-a92672a9fab99bfc18d0da3684947ea4432578e0.tar.gz
meson: don't use deprecated pkgconfig variable
As with a previous change to the class[1], the "pkgconfig" entry is now deprecated and "pkg-config" should be used instead. [1] oe-core d64b307891422e290bbe821d4303b3af526bbe17 (From OE-Core rev: 14ee7a2310b5d3da5e7af442454f7957c6c090b7) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 3e441544f1aa7258718a1cadd6836d9cd9dc65ab) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-devtools/meson/meson_1.3.1.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/meson/meson_1.3.1.bb b/meta/recipes-devtools/meson/meson_1.3.1.bb
index 9cc0cc31ab..f34af0e06d 100644
--- a/meta/recipes-devtools/meson/meson_1.3.1.bb
+++ b/meta/recipes-devtools/meson/meson_1.3.1.bb
@@ -86,7 +86,7 @@ ar = ${@meson_array('BUILD_AR', d)}
86nm = ${@meson_array('BUILD_NM', d)} 86nm = ${@meson_array('BUILD_NM', d)}
87strip = ${@meson_array('BUILD_STRIP', d)} 87strip = ${@meson_array('BUILD_STRIP', d)}
88readelf = ${@meson_array('BUILD_READELF', d)} 88readelf = ${@meson_array('BUILD_READELF', d)}
89pkgconfig = 'pkg-config-native' 89pkg-config = 'pkg-config-native'
90 90
91[built-in options] 91[built-in options]
92c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}] 92c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}]
@@ -104,7 +104,7 @@ cpp = @CXX
104ar = @AR 104ar = @AR
105nm = @NM 105nm = @NM
106strip = @STRIP 106strip = @STRIP
107pkgconfig = 'pkg-config' 107pkg-config = 'pkg-config'
108 108
109[built-in options] 109[built-in options]
110c_args = @CFLAGS 110c_args = @CFLAGS