Starting meson 1.3.0, the pkgconfig variable is deprecated in favor of pkg-config. Keep both variables as suggested in meson RN.
Link: https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig Cc: sta...@dpdk.org Signed-off-by: David Marchand <david.march...@redhat.com> --- config/arm/arm32_armv8_linux_gcc | 1 + config/arm/arm64_altra_linux_gcc | 1 + config/arm/arm64_ampereone_linux_gcc | 1 + config/arm/arm64_armada_linux_gcc | 1 + config/arm/arm64_armv8_linux_clang_ubuntu | 1 + config/arm/arm64_armv8_linux_gcc | 1 + config/arm/arm64_bluefield3_linux_gcc | 1 + config/arm/arm64_bluefield_linux_gcc | 1 + config/arm/arm64_capri_linux_gcc | 1 + config/arm/arm64_cdx_linux_gcc | 1 + config/arm/arm64_centriq2400_linux_gcc | 1 + config/arm/arm64_cn10k_linux_gcc | 1 + config/arm/arm64_cn9k_linux_gcc | 1 + config/arm/arm64_dpaa_linux_gcc | 1 + config/arm/arm64_elba_linux_gcc | 1 + config/arm/arm64_emag_linux_gcc | 1 + config/arm/arm64_ft2000plus_linux_gcc | 1 + config/arm/arm64_grace_linux_gcc | 1 + config/arm/arm64_graviton2_linux_gcc | 1 + config/arm/arm64_graviton3_linux_gcc | 1 + config/arm/arm64_graviton4_linux_gcc | 1 + config/arm/arm64_hip10_linux_gcc | 1 + config/arm/arm64_kunpeng920_linux_gcc | 1 + config/arm/arm64_kunpeng930_linux_gcc | 1 + config/arm/arm64_n1sdp_linux_gcc | 1 + config/arm/arm64_n2_linux_gcc | 1 + config/arm/arm64_odyssey_linux_gcc | 1 + config/arm/arm64_stingray_linux_gcc | 1 + config/arm/arm64_thunderx2_linux_gcc | 1 + config/arm/arm64_thunderxt83_linux_gcc | 1 + config/arm/arm64_thunderxt88_linux_gcc | 1 + config/arm/arm64_tys2500_linux_gcc | 1 + config/arm/arm64_v2_linux_gcc | 1 + config/x86/cross-mingw | 1 + 34 files changed, 34 insertions(+) diff --git a/config/arm/arm32_armv8_linux_gcc b/config/arm/arm32_armv8_linux_gcc index 269a60ba19..abcb182b16 100644 --- a/config/arm/arm32_armv8_linux_gcc +++ b/config/arm/arm32_armv8_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'arm-linux-gnueabihf-g++'] ar = 'arm-linux-gnueabihf-gcc-ar' strip = 'arm-linux-gnueabihf-strip' pkgconfig = 'arm-linux-gnueabihf-pkg-config' +pkg-config = 'arm-linux-gnueabihf-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_altra_linux_gcc b/config/arm/arm64_altra_linux_gcc index ce0667ebe2..769503d936 100644 --- a/config/arm/arm64_altra_linux_gcc +++ b/config/arm/arm64_altra_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_ampereone_linux_gcc b/config/arm/arm64_ampereone_linux_gcc index 8964432a74..bb6acfc4cf 100644 --- a/config/arm/arm64_ampereone_linux_gcc +++ b/config/arm/arm64_ampereone_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_armada_linux_gcc b/config/arm/arm64_armada_linux_gcc index 635b4946a3..8f36d895da 100644 --- a/config/arm/arm64_armada_linux_gcc +++ b/config/arm/arm64_armada_linux_gcc @@ -5,6 +5,7 @@ ar = 'aarch64-linux-gnu-ar' as = 'aarch64-linux-gnu-as' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_armv8_linux_clang_ubuntu b/config/arm/arm64_armv8_linux_clang_ubuntu index 86ae43937b..e34fabebe5 100644 --- a/config/arm/arm64_armv8_linux_clang_ubuntu +++ b/config/arm/arm64_armv8_linux_clang_ubuntu @@ -6,6 +6,7 @@ strip = 'llvm-strip' llvm-config = 'llvm-config' pcap-config = 'llvm-config' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' [host_machine] system = 'linux' diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc index 529694b49d..a9b136cf48 100644 --- a/config/arm/arm64_armv8_linux_gcc +++ b/config/arm/arm64_armv8_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_bluefield3_linux_gcc b/config/arm/arm64_bluefield3_linux_gcc index 775cf5883d..d900e72a6d 100644 --- a/config/arm/arm64_bluefield3_linux_gcc +++ b/config/arm/arm64_bluefield3_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_bluefield_linux_gcc b/config/arm/arm64_bluefield_linux_gcc index 1286227915..bcffb6534b 100644 --- a/config/arm/arm64_bluefield_linux_gcc +++ b/config/arm/arm64_bluefield_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_capri_linux_gcc b/config/arm/arm64_capri_linux_gcc index 1a6313e684..5099ec66a5 100644 --- a/config/arm/arm64_capri_linux_gcc +++ b/config/arm/arm64_capri_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_cdx_linux_gcc b/config/arm/arm64_cdx_linux_gcc index 8e6d619dae..bf494b776e 100644 --- a/config/arm/arm64_cdx_linux_gcc +++ b/config/arm/arm64_cdx_linux_gcc @@ -5,6 +5,7 @@ ar = 'aarch64-linux-gnu-ar' as = 'aarch64-linux-gnu-as' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_centriq2400_linux_gcc b/config/arm/arm64_centriq2400_linux_gcc index bc8737e072..33cb5ef675 100644 --- a/config/arm/arm64_centriq2400_linux_gcc +++ b/config/arm/arm64_centriq2400_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_cn10k_linux_gcc b/config/arm/arm64_cn10k_linux_gcc index fa904af5d0..63fcca9cbe 100644 --- a/config/arm/arm64_cn10k_linux_gcc +++ b/config/arm/arm64_cn10k_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' cmake = 'cmake' diff --git a/config/arm/arm64_cn9k_linux_gcc b/config/arm/arm64_cn9k_linux_gcc index 646ce4b5d3..fa4618e370 100644 --- a/config/arm/arm64_cn9k_linux_gcc +++ b/config/arm/arm64_cn9k_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' cmake = 'cmake' diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc index 8465b5097b..bf0eab18e2 100644 --- a/config/arm/arm64_dpaa_linux_gcc +++ b/config/arm/arm64_dpaa_linux_gcc @@ -5,6 +5,7 @@ ar = 'aarch64-linux-gnu-ar' as = 'aarch64-linux-gnu-as' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_elba_linux_gcc b/config/arm/arm64_elba_linux_gcc index 4d891bd5a7..624a821adb 100644 --- a/config/arm/arm64_elba_linux_gcc +++ b/config/arm/arm64_elba_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_emag_linux_gcc b/config/arm/arm64_emag_linux_gcc index 248169ed68..3e8c15f8a4 100644 --- a/config/arm/arm64_emag_linux_gcc +++ b/config/arm/arm64_emag_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_ft2000plus_linux_gcc b/config/arm/arm64_ft2000plus_linux_gcc index ae9f779056..4ecb251d3f 100644 --- a/config/arm/arm64_ft2000plus_linux_gcc +++ b/config/arm/arm64_ft2000plus_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_grace_linux_gcc b/config/arm/arm64_grace_linux_gcc index bde55b17a8..81e56674f6 100644 --- a/config/arm/arm64_grace_linux_gcc +++ b/config/arm/arm64_grace_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_graviton2_linux_gcc b/config/arm/arm64_graviton2_linux_gcc index fdb298bb11..b5f681bc27 100644 --- a/config/arm/arm64_graviton2_linux_gcc +++ b/config/arm/arm64_graviton2_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_graviton3_linux_gcc b/config/arm/arm64_graviton3_linux_gcc index 19b422075d..77b5168836 100644 --- a/config/arm/arm64_graviton3_linux_gcc +++ b/config/arm/arm64_graviton3_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_graviton4_linux_gcc b/config/arm/arm64_graviton4_linux_gcc index 839224bca7..3b674f7800 100644 --- a/config/arm/arm64_graviton4_linux_gcc +++ b/config/arm/arm64_graviton4_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_hip10_linux_gcc b/config/arm/arm64_hip10_linux_gcc index 2943e4abbf..85bcd05887 100644 --- a/config/arm/arm64_hip10_linux_gcc +++ b/config/arm/arm64_hip10_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_kunpeng920_linux_gcc b/config/arm/arm64_kunpeng920_linux_gcc index 193fb48a61..6e7d8ac667 100644 --- a/config/arm/arm64_kunpeng920_linux_gcc +++ b/config/arm/arm64_kunpeng920_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_kunpeng930_linux_gcc b/config/arm/arm64_kunpeng930_linux_gcc index e4281ceb4f..61fe482a2e 100644 --- a/config/arm/arm64_kunpeng930_linux_gcc +++ b/config/arm/arm64_kunpeng930_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_n1sdp_linux_gcc b/config/arm/arm64_n1sdp_linux_gcc index 2806a4241b..c3c12098d8 100644 --- a/config/arm/arm64_n1sdp_linux_gcc +++ b/config/arm/arm64_n1sdp_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_n2_linux_gcc b/config/arm/arm64_n2_linux_gcc index 7404bd197b..89200861c4 100644 --- a/config/arm/arm64_n2_linux_gcc +++ b/config/arm/arm64_n2_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_odyssey_linux_gcc b/config/arm/arm64_odyssey_linux_gcc index 532c708bde..9cd49b5717 100644 --- a/config/arm/arm64_odyssey_linux_gcc +++ b/config/arm/arm64_odyssey_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-marvell-linux-gnu-g++'] ar = 'aarch64-marvell-linux-gnu-gcc-ar' strip = 'aarch64-marvell-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' [host_machine] system = 'linux' diff --git a/config/arm/arm64_stingray_linux_gcc b/config/arm/arm64_stingray_linux_gcc index 08148b5c3d..358f3b43d3 100644 --- a/config/arm/arm64_stingray_linux_gcc +++ b/config/arm/arm64_stingray_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_thunderx2_linux_gcc b/config/arm/arm64_thunderx2_linux_gcc index 32ae938e95..124a97da01 100644 --- a/config/arm/arm64_thunderx2_linux_gcc +++ b/config/arm/arm64_thunderx2_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_thunderxt83_linux_gcc b/config/arm/arm64_thunderxt83_linux_gcc index e9d9e62d44..433c3cb4e3 100644 --- a/config/arm/arm64_thunderxt83_linux_gcc +++ b/config/arm/arm64_thunderxt83_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_thunderxt88_linux_gcc b/config/arm/arm64_thunderxt88_linux_gcc index c6e5a5656a..81975aea14 100644 --- a/config/arm/arm64_thunderxt88_linux_gcc +++ b/config/arm/arm64_thunderxt88_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_tys2500_linux_gcc b/config/arm/arm64_tys2500_linux_gcc index fce85fb0d8..24e6539a15 100644 --- a/config/arm/arm64_tys2500_linux_gcc +++ b/config/arm/arm64_tys2500_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_v2_linux_gcc b/config/arm/arm64_v2_linux_gcc index 50d9be3da3..f27eeead66 100644 --- a/config/arm/arm64_v2_linux_gcc +++ b/config/arm/arm64_v2_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/x86/cross-mingw b/config/x86/cross-mingw index cddebda5b5..11597eaa26 100644 --- a/config/x86/cross-mingw +++ b/config/x86/cross-mingw @@ -5,6 +5,7 @@ ld = 'x86_64-w64-mingw32-ld' ar = 'x86_64-w64-mingw32-ar' strip = 'x86_64-w64-mingw32-strip' pkgconfig = 'x86_64-w64-mingw32-pkg-config' +pkg-config = 'x86_64-w64-mingw32-pkg-config' objdump = 'x86_64-w64-mingw32-objdump' [host_machine] -- 2.45.1
