-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[vcpkg-tool-meson] Update meson to 1.3.2 (#28084)
- Loading branch information
Showing
35 changed files
with
849 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build | ||
| index d7aa127b48..c313dc272d 100644 | ||
| --- a/gdk-pixbuf/meson.build | ||
| +++ b/gdk-pixbuf/meson.build | ||
| @@ -214,6 +214,7 @@ gdkpixbuf = library('gdk_pixbuf-2.0', | ||
| dependencies: [ | ||
| gdk_pixbuf_deps, | ||
| included_loaders_deps, | ||
| + loaders_deps | ||
| ], | ||
| install: true) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/mesonbuild/cmake/toolchain.py b/mesonbuild/cmake/toolchain.py | ||
| index abf2cf6..477629e 100644 | ||
| --- a/mesonbuild/cmake/toolchain.py | ||
| +++ b/mesonbuild/cmake/toolchain.py | ||
| @@ -204,6 +204,6 @@ class CMakeToolchain: | ||
| @staticmethod | ||
| def is_cmdline_option(compiler: 'Compiler', arg: str) -> bool: | ||
| if compiler.get_argument_syntax() == 'msvc': | ||
| - return arg.startswith('/') | ||
| + return arg.startswith(('/','-')) | ||
| else: | ||
| return arg.startswith('-') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py | ||
| index 38e3d5f..6427980 100644 | ||
| --- a/mesonbuild/dependencies/python.py | ||
| +++ b/mesonbuild/dependencies/python.py | ||
| @@ -208,7 +208,8 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): | ||
| # compile args | ||
| + verdot = self.variables.get('py_version_short') | ||
| inc_paths = mesonlib.OrderedSet([ | ||
| self.variables.get('INCLUDEPY'), | ||
| - self.paths.get('include'), | ||
| + self.paths.get('include') + f'/../../../include/python${verdot}', | ||
| self.paths.get('platinclude')]) | ||
|
|
||
| self.compile_args += ['-I' + path for path in inc_paths if path] | ||
| @@ -279,9 +279,9 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): | ||
| else: | ||
| libpath = Path(f'python{vernum}.dll') | ||
| else: | ||
| if limited_api: | ||
| vernum = vernum[0] | ||
| - libpath = Path('libs') / f'python{vernum}.lib' | ||
| + libpath = Path('libs') / f'..' / f'..' / f'..' / f'lib' / f'python{vernum}.lib' | ||
| # For a debug build, pyconfig.h may force linking with | ||
| # pythonX_d.lib (see meson#10776). This cannot be avoided | ||
| # and won't work unless we also have a debug build of | ||
| @@ -296,6 +296,8 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase): | ||
| vscrt = self.env.coredata.options[mesonlib.OptionKey('b_vscrt')].value | ||
| if vscrt in {'mdd', 'mtd', 'from_buildtype', 'static_from_buildtype'}: | ||
| vscrt_debug = True | ||
| + if is_debug_build: | ||
| + libpath = Path('libs') / f'..' / f'..' / f'..' / f'debug/lib' / f'python{vernum}_d.lib' | ||
| if is_debug_build and vscrt_debug and not self.variables.get('Py_DEBUG'): | ||
| mlog.warning(textwrap.dedent('''\ | ||
| Using a debug build type with MSVC or an MSVC-compatible compiler | ||
| @@ -390,10 +390,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | ||
| set_env('PKG_CONFIG_PATH', old_pkg_path) | ||
|
|
||
| candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation)) | ||
| + candidates.append(functools.partial(PythonPkgConfigDependency, pkg_name, env, kwargs, installation)) | ||
| - # We only need to check both, if a python install has a LIBPC. It might point to the wrong location, | ||
| - # e.g. relocated / cross compilation, but the presence of LIBPC indicates we should definitely look for something. | ||
| - if pkg_libdir is not None: | ||
| - candidates.append(functools.partial(PythonPkgConfigDependency, pkg_name, env, kwargs, installation)) | ||
| else: | ||
| candidates.append(functools.partial(PkgConfigDependency, 'python3', env, kwargs)) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| [binaries] | ||
| cmake = ['@CMAKE_COMMAND@'] | ||
| ninja = ['@NINJA@'] | ||
| pkg-config= ['@PKGCONFIG@'] | ||
| @MESON_MT@ | ||
| @MESON_AR@ | ||
| @MESON_RC@ | ||
| @MESON_C@ | ||
| @MESON_C_LD@ | ||
| @MESON_CXX@ | ||
| @MESON_CXX_LD@ | ||
| @MESON_OBJC@ | ||
| @MESON_OBJC_LD@ | ||
| @MESON_OBJCPP@ | ||
| @MESON_OBJCPP_LD@ | ||
| @MESON_FC@ | ||
| @MESON_FC_LD@ | ||
| @MESON_WINDRES@ | ||
| @MESON_ADDITIONAL_BINARIES@ | ||
| [properties] | ||
| cmake_toolchain_file = '@SCRIPTS@/buildsystems/vcpkg.cmake' | ||
| [cmake] | ||
| VCPKG_TARGET_TRIPLET = '@TARGET_TRIPLET@' | ||
| VCPKG_HOST_TRIPLET = '@_HOST_TRIPLET@' | ||
| VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '@VCPKG_CHAINLOAD_TOOLCHAIN_FILE@' | ||
| VCPKG_CRT_LINKAGE = '@VCPKG_CRT_LINKAGE@' | ||
| _VCPKG_INSTALLED_DIR = '@_VCPKG_INSTALLED_DIR@' | ||
| @MESON_HOST_MACHINE@ | ||
| @MESON_BUILD_MACHINE@ | ||
| [built-in options] | ||
| default_library = '@MESON_DEFAULT_LIBRARY@' | ||
| werror = false | ||
| @MESON_CFLAGS@ | ||
| @MESON_CXXFLAGS@ | ||
| @MESON_FCFLAGS@ | ||
| @MESON_OBJCFLAGS@ | ||
| @MESON_OBJCPPFLAGS@ | ||
| # b_vscrt | ||
| @MESON_VSCRT_LINKAGE@ | ||
| # c_winlibs/cpp_winlibs | ||
| @MESON_WINLIBS@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.