Skip to content

Commit

Permalink
Meson: replace deprecated "pkgconfig" entry in machine files (#214)
Browse files Browse the repository at this point in the history
  • Loading branch information
kleisauke authored Dec 27, 2023
1 parent 08d57f2 commit 57713b8
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion platforms/linux-arm64v8/meson.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[binaries]
strip = 'strip'
pkgconfig = ['pkg-config', '--static']
pkg-config = ['pkg-config', '--static']

[built-in options]
libdir = 'lib'
Expand Down
2 changes: 1 addition & 1 deletion platforms/linux-armv6/meson.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion platforms/linux-armv7/meson.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion platforms/linux-s390x/meson.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion platforms/linux-x64/meson.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[binaries]
strip = 'strip'
pkgconfig = ['pkg-config', '--static']
pkg-config = ['pkg-config', '--static']

[built-in options]
libdir = 'lib'
Expand Down
2 changes: 1 addition & 1 deletion platforms/linuxmusl-arm64v8/meson.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/linuxmusl-x64/meson.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 57713b8

Please sign in to comment.