mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
ff68673745
* [fontconfig] fix pkgconfig file installation (microsoft/vcpkg#35002)
move pkgconfig script into the path indicated by the diagnositic emitted by
vcpkg (see comment 1 of microsoft/vcpkg#35002).
* [fontconfig] force installation of pc files (microsoft/vcpkg#35002)
Undo the last commit and patch meson to force the pc file installation paths
demanded by `vcpkg_fixup_pkgconfig`
* [fontconfig] bump portrevision (microsoft/vcpkg#35002)
* [fontconfig] regenerate versions (microsoft/vcpkg#35002)
* Revert "[fontconfig] regenerate versions (microsoft/vcpkg#35002)"
This reverts commit 8daf0e15a67c376779631442ce926236ba2ed2e4.
* Revert "[fontconfig] bump portrevision (microsoft/vcpkg#35002)"
This reverts commit a9727bc32325238565428e3497ae564d2d255b86.
* Revert "[fontconfig] force installation of pc files (microsoft/vcpkg#35002)"
This reverts commit c0c6e017c7ab255e5532428e68f9d7c6e1ae8aad.
* Revert "[fontconfig] fix pkgconfig file installation (microsoft/vcpkg#35002)"
This reverts commit 616d4ce83e091cd128f4d896fcff81a1de4ed1b9.
* [vcpkg-tool-meson] fix pc-file installation paths on FreeBSD (microsoft#35002)
* [vcpkg-tool-meson] bump portversion (microsoft/vcpkg#35002)
* [vcpkg-tool-meson] regenerate versions (microsoft/vcpkg#35002)
* [vcpkg-tool-meson] Use vcpkg_from_github to obtain source (microsoft/vcpkg#35002)
* [vcpkg-tool-meson] Regenerate versions (microsoft/vcpkg#35002)
* [vcpkg-tool-meson] Use adverticed version of meson (microsoft/vcpkg#35002)
vcpkg@ce9f50f7 has bumped vcpkg-tool-meson's adverticed version to 0.63, but
not updated the `ref` variable, which still points to 0.62.1.
Update meson to 0.63 and use ${VERSION} to avoid similar issues in the future,
and regenerate patches/hashes accordingly.
* [vcpkg-tool-meson] regenerate versions (microsoft/vcpkg#35002)
* Revert "[vcpkg-tool-meson] regenerate versions (microsoft/vcpkg#35002)"
This reverts commit e9a424ef16d26e791e3e108e738982138084d41a.
* Revert "[vcpkg-tool-meson] Use adverticed version of meson (microsoft/vcpkg#35002)"
Meson 0.63 can't build gobject-introspection on a tier 1 supported target.
Upgrading meson to 0.63 and handling regressions of that update is out of
scope of #35002 anyways, and should be handled either on it's own PR,
microsoft/vcpkg#28084 or microsoft/vcpkg#35348 .
18 lines
1.1 KiB
Diff
18 lines
1.1 KiB
Diff
--- a/mesonbuild/modules/pkgconfig.py
|
|
+++ b/mesonbuild/modules/pkgconfig.py
|
|
@@ -583,12 +583,8 @@ class PkgConfigModule(ExtensionModule):
|
|
pcfile = filebase + '.pc'
|
|
pkgroot = pkgroot_name = kwargs.get('install_dir', default_install_dir)
|
|
if pkgroot is None:
|
|
- if mesonlib.is_freebsd():
|
|
- pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('prefix')), 'libdata', 'pkgconfig')
|
|
- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
|
|
- else:
|
|
- pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig')
|
|
- pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
|
|
+ pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig')
|
|
+ pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
|
|
if not isinstance(pkgroot, str):
|
|
raise mesonlib.MesonException('Install_dir must be a string.')
|
|
self._generate_pkgconfig_file(state, deps, subdirs, name, description, url,
|