diff options
| author | L. E. Segovia <amy@centricular.com> | 2023-08-23 11:44:26 -0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2023-11-20 21:11:43 +0000 |
| commit | 5a82a336467d97b54108f73f1bf4843149cf86c5 (patch) | |
| tree | fb0afc5d041131942e872b04ef2d3fa5b567d4b8 | |
| parent | 1cf6e834043dab359e14fe6126e770c4cfe9e6b2 (diff) | |
pango: Add Perl interpreter consistency check
In Windows, we've got the case that Perl is found from the UCRT64 path,
but Meson wants to invoke it for a MSYS64 script. This results in a
Locale::gettext import failure only detectable at build time.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1266>
| -rw-r--r-- | recipes/pango.recipe | 1 | ||||
| -rw-r--r-- | recipes/pango/0004-utils-Check-that-help2man-can-run-if-found.patch | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/recipes/pango.recipe b/recipes/pango.recipe index a7574bc7..ba3e6f80 100644 --- a/recipes/pango.recipe +++ b/recipes/pango.recipe @@ -18,6 +18,7 @@ class Recipe(recipe.Recipe): 'pango/0001-pango-layout-fix-build-with-Android-s-bionic-libc.patch', # https://gitlab.gnome.org/GNOME/pango/-/merge_requests/694 'pango/0001-win32-Fix-32bit-build-crash-on-DeleteDC.patch', + 'pango/0004-utils-Check-that-help2man-can-run-if-found.patch', ] files_libs = ['libpangocairo-1.0', 'libpango-1.0', 'libpangoft2-1.0'] diff --git a/recipes/pango/0004-utils-Check-that-help2man-can-run-if-found.patch b/recipes/pango/0004-utils-Check-that-help2man-can-run-if-found.patch new file mode 100644 index 00000000..209a6f29 --- /dev/null +++ b/recipes/pango/0004-utils-Check-that-help2man-can-run-if-found.patch @@ -0,0 +1,28 @@ +From e87408cf591369f48cfcb283464e20f2ce225bc6 Mon Sep 17 00:00:00 2001 +From: "L. E. Segovia" <amy@centricular.com> +Date: Wed, 23 Aug 2023 11:35:19 -0300 +Subject: [PATCH 4/4] utils: Check that help2man can run if found + +Meson doesn't check Perl interpreters for consistency, leading to +modules being not found only at run time. +--- + utils/meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/utils/meson.build b/utils/meson.build +index 5072c1c..81db65e 100644 +--- a/utils/meson.build ++++ b/utils/meson.build +@@ -42,7 +42,8 @@ pango_view = executable('pango-view', pango_view_sources, + help2man = find_program('help2man', required: false) + # help2man has to run pango-view to generate the man page, which it can't do if + # we're cross building. We also can't tell help2man what exe wrapper to use. +-if help2man.found() and not meson.is_cross_build() ++ ++if help2man.found() and run_command(help2man, '--version', check: false).returncode() == 0 and not meson.is_cross_build() + help2man_opts = [ + '--no-info', + '--section=1', +-- +2.40.1.windows.1 + |