From 57713b80c8ee51f19e258b100e5197551315cd18 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Wed, 27 Dec 2023 11:33:10 +0100 Subject: [PATCH] Meson: replace deprecated "pkgconfig" entry in machine files (#214) --- platforms/linux-arm64v8/meson.ini | 2 +- platforms/linux-armv6/meson.ini | 2 +- platforms/linux-armv7/meson.ini | 2 +- platforms/linux-s390x/meson.ini | 2 +- platforms/linux-x64/meson.ini | 2 +- platforms/linuxmusl-arm64v8/meson.ini | 2 +- platforms/linuxmusl-x64/meson.ini | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platforms/linux-arm64v8/meson.ini b/platforms/linux-arm64v8/meson.ini index 93999c2f..981d25d0 100644 --- a/platforms/linux-arm64v8/meson.ini +++ b/platforms/linux-arm64v8/meson.ini @@ -1,6 +1,6 @@ [binaries] strip = 'strip' -pkgconfig = ['pkg-config', '--static'] +pkg-config = ['pkg-config', '--static'] [built-in options] libdir = 'lib' diff --git a/platforms/linux-armv6/meson.ini b/platforms/linux-armv6/meson.ini index e442b0f0..d8583a7b 100644 --- a/platforms/linux-armv6/meson.ini +++ b/platforms/linux-armv6/meson.ini @@ -12,7 +12,7 @@ nm = 'arm-rpi-linux-gnueabihf-gcc-nm' ld = 'arm-rpi-linux-gnueabihf-gcc-ld' strip = 'arm-rpi-linux-gnueabihf-strip' ranlib = 'arm-rpi-linux-gnueabihf-gcc-ranlib' -pkgconfig = ['arm-linux-gnueabihf-pkg-config', '--static'] +pkg-config = ['arm-linux-gnueabihf-pkg-config', '--static'] [built-in options] libdir = 'lib' diff --git a/platforms/linux-armv7/meson.ini b/platforms/linux-armv7/meson.ini index 7bc926ca..ab9c086a 100644 --- a/platforms/linux-armv7/meson.ini +++ b/platforms/linux-armv7/meson.ini @@ -12,7 +12,7 @@ nm = 'arm-linux-gnueabihf-gcc-nm' ld = 'arm-linux-gnueabihf-gcc-ld' strip = 'arm-linux-gnueabihf-strip' ranlib = 'arm-linux-gnueabihf-gcc-ranlib' -pkgconfig = ['arm-linux-gnueabihf-pkg-config', '--static'] +pkg-config = ['arm-linux-gnueabihf-pkg-config', '--static'] [built-in options] libdir = 'lib' diff --git a/platforms/linux-s390x/meson.ini b/platforms/linux-s390x/meson.ini index d492c099..80ee833c 100644 --- a/platforms/linux-s390x/meson.ini +++ b/platforms/linux-s390x/meson.ini @@ -12,7 +12,7 @@ nm = 's390x-linux-gnu-gcc-nm' ld = 's390x-linux-gnu-gcc-ld' strip = 's390x-linux-gnu-strip' ranlib = 's390x-linux-gnu-gcc-ranlib' -pkgconfig = ['s390x-linux-gnu-pkg-config', '--static'] +pkg-config = ['s390x-linux-gnu-pkg-config', '--static'] [built-in options] libdir = 'lib' diff --git a/platforms/linux-x64/meson.ini b/platforms/linux-x64/meson.ini index 93999c2f..981d25d0 100644 --- a/platforms/linux-x64/meson.ini +++ b/platforms/linux-x64/meson.ini @@ -1,6 +1,6 @@ [binaries] strip = 'strip' -pkgconfig = ['pkg-config', '--static'] +pkg-config = ['pkg-config', '--static'] [built-in options] libdir = 'lib' diff --git a/platforms/linuxmusl-arm64v8/meson.ini b/platforms/linuxmusl-arm64v8/meson.ini index 67b75923..c8418115 100644 --- a/platforms/linuxmusl-arm64v8/meson.ini +++ b/platforms/linuxmusl-arm64v8/meson.ini @@ -12,7 +12,7 @@ nm = 'aarch64-linux-musl-nm' ld = 'aarch64-linux-musl-ld' strip = 'aarch64-linux-musl-strip' ranlib = 'aarch64-linux-musl-ranlib' -pkgconfig = ['aarch64-linux-musl-pkg-config', '--static'] +pkg-config = ['aarch64-linux-musl-pkg-config', '--static'] # Ensure we disable the inotify backend in GIO # See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2991#note_1592863 diff --git a/platforms/linuxmusl-x64/meson.ini b/platforms/linuxmusl-x64/meson.ini index cc4b5425..12d1fec7 100644 --- a/platforms/linuxmusl-x64/meson.ini +++ b/platforms/linuxmusl-x64/meson.ini @@ -1,6 +1,6 @@ [binaries] strip = 'strip' -pkgconfig = ['pkg-config', '--static'] +pkg-config = ['pkg-config', '--static'] # Ensure we disable the inotify backend in GIO # See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2991#note_1592863