diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2023-08-01 14:23:57 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2023-08-02 01:35:16 -0400 |
| commit | 13f8eba9b63fe5185ba34c2690dffac651d91593 (patch) | |
| tree | a8566fa922c4433fa20ecf4e5feaa0d093673463 /cross/armclang-linux.txt | |
| parent | 947e0f819b942951dfc251da37ef4ae83b3ea9b7 (diff) | |
| download | meson-13f8eba9b63fe5185ba34c2690dffac651d91593.zip meson-13f8eba9b63fe5185ba34c2690dffac651d91593.tar.gz meson-13f8eba9b63fe5185ba34c2690dffac651d91593.tar.bz2 | |
treewide: internally avoid deprecated machine file uses of "pkgconfig"
We support this in a machine file:
```
[binaries]
pkgconfig = 'pkg-config'
pkg-config = 'pkg-config'
```
and you can use either one, because internally we look up both. If you
only set *one* of them, this plays awkwardly with setting $PKG_CONFIG,
since we don't know which one you set in the machine file and the
*other* one will be initialized from the environment instead.
In commit 22df45a31981874310a78dde0df59a6a7c5ebb29 we changed program
lookup of config-tool style dependencies to use the regular tool names
and only fall back on the strange internal names. This affected the
pkg-config class too.
The result is that instead of preferring `pkgconfig =` followed by
$PKG_CONFIG followed by `pkg-config =`, we inverted the lookup order.
This is a good idea anyway, because now it behaves consistently with
`find_program('pkg-config')`.
Unfortunately, we documented the wrong name in a bunch of places, and
also used the wrong name in various testsuite bits, which meant that if
you set $PKG_CONFIG and then ran the testsuite, it would fail.
Correct these references, because they are buggy.
One test case expected to find_program() a native copy for convenience
of testing against natively installed glib. Force it to resolve a native
copy.
Diffstat (limited to 'cross/armclang-linux.txt')
| -rw-r--r-- | cross/armclang-linux.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt index 863b355..36927b8 100644 --- a/cross/armclang-linux.txt +++ b/cross/armclang-linux.txt @@ -22,7 +22,7 @@ c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--tar #cpp = '/usr/bin/arm-linux-gnueabihf-g++' ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar' #strip = '/usr/arm-linux-gnueabihf/bin/strip' -#pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config' +#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config' [host_machine] system = 'baremetal' |