mirror of
https://github.com/mesonbuild/meson.git
synced 2026-11-06 05:16:42 +00:00
Eli Schwartz
13f8eba9b6
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 22df45a319 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.
31 lines
905 B
Plaintext
31 lines
905 B
Plaintext
[binaries]
|
|
c = '/usr/bin/x86_64-w64-mingw32-gcc'
|
|
cpp = '/usr/bin/x86_64-w64-mingw32-g++'
|
|
objc = '/usr/bin/x86_64-w64-mingw32-gcc'
|
|
ar = '/usr/bin/x86_64-w64-mingw32-ar'
|
|
strip = '/usr/bin/x86_64-w64-mingw32-strip'
|
|
pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
|
|
windres = '/usr/bin/x86_64-w64-mingw32-windres'
|
|
exe_wrapper = 'wine'
|
|
cmake = '/usr/bin/cmake'
|
|
|
|
[properties]
|
|
# Directory that contains 'bin', 'lib', etc
|
|
root = '/usr/x86_64-w64-mingw32'
|
|
# Directory that contains 'bin', 'lib', etc for the toolchain and system libraries
|
|
sys_root = '/usr/x86_64-w64-mingw32/sys-root/mingw'
|
|
|
|
[host_machine]
|
|
system = 'windows'
|
|
cpu_family = 'x86_64'
|
|
cpu = 'x86_64'
|
|
endian = 'little'
|
|
|
|
[cmake]
|
|
|
|
CMAKE_BUILD_WITH_INSTALL_RPATH = 'ON'
|
|
CMAKE_FIND_ROOT_PATH_MODE_PROGRAM = 'NEVER'
|
|
CMAKE_FIND_ROOT_PATH_MODE_LIBRARY = 'ONLY'
|
|
CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = 'ONLY'
|
|
CMAKE_FIND_ROOT_PATH_MODE_PACKAGE = 'ONLY'
|