vcpkg/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch

15 lines
849 B
Diff
Raw Normal View History

diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index 1bdf829..5f1bfd9 100644
[vcpkg-tool-meson] fix pkgconfig data file installation on FreeBSD (#35003) * [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 .
2023-12-13 11:02:35 +00:00
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -701,6 +701,9 @@ class PkgConfigModule(NewExtensionModule):
[vcpkg-tool-meson] fix pkgconfig data file installation on FreeBSD (#35003) * [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 .
2023-12-13 11:02:35 +00:00
pcfile = filebase + '.pc'
pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
[vcpkg-tool-meson] fix pkgconfig data file installation on FreeBSD (#35003) * [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 .
2023-12-13 11:02:35 +00:00
if pkgroot is None:
+ pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('libdir'))), 'pkgconfig')
[vcpkg-tool-meson] fix pkgconfig data file installation on FreeBSD (#35003) * [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 .
2023-12-13 11:02:35 +00:00
+ pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
+ elif False:
if mesonlib.is_freebsd():
pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'libdata', 'pkgconfig')
pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')