diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2020-11-24 13:12:59 +0000 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2020-12-07 13:35:38 +1100 |
| commit | 32cb1dcdf035329c3980b246323bd4d9ff537167 (patch) | |
| tree | 83fc029b12511057817ecfc3b40067a80b4a859d | |
| parent | 4f861441d9c9b314d854039d66f867c920edf31e (diff) | |
glib: fix cross-compilation for macOS
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/661>
| -rw-r--r-- | recipes/glib.recipe | 4 | ||||
| -rw-r--r-- | recipes/glib/0001-macos-fix-frexpl-checks-in-cross-compilation.patch | 27 |
2 files changed, 30 insertions, 1 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 463cd16b..f8783a67 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -49,7 +49,9 @@ class Recipe(recipe.Recipe): # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1522 'glib/0001-meson-Fix-gnulib-printf-checks.patch', # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1579 - 'glib/0001-glib-Use-g_getenv-everywhere-instead-of-getenv.patch' + 'glib/0001-glib-Use-g_getenv-everywhere-instead-of-getenv.patch', + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1771 + 'glib/0001-macos-fix-frexpl-checks-in-cross-compilation.patch', ] files_libs = [ diff --git a/recipes/glib/0001-macos-fix-frexpl-checks-in-cross-compilation.patch b/recipes/glib/0001-macos-fix-frexpl-checks-in-cross-compilation.patch new file mode 100644 index 00000000..b2548f6d --- /dev/null +++ b/recipes/glib/0001-macos-fix-frexpl-checks-in-cross-compilation.patch @@ -0,0 +1,27 @@ +From 64dda3ad87af85c657389ce69ec49204175d8332 Mon Sep 17 00:00:00 2001 +From: Andoni Morales Alastruey <ylatuya@gmail.com> +Date: Tue, 24 Nov 2020 13:05:17 +0000 +Subject: [PATCH] macos: fix frexpl checks in cross-compilation + +Cross-compilation to arm64 for Apple Silicon is not possible +due to the hardcoded settings for frexpl. +See: #1868 +--- + glib/gnulib/gl_cv_func_frexpl_works/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/glib/gnulib/gl_cv_func_frexpl_works/meson.build b/glib/gnulib/gl_cv_func_frexpl_works/meson.build +index 303ec63d7..50e614e89 100644 +--- a/glib/gnulib/gl_cv_func_frexpl_works/meson.build ++++ b/glib/gnulib/gl_cv_func_frexpl_works/meson.build +@@ -120,7 +120,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() + else + if (host_system.startswith ('aix') or + host_system.startswith ('beos') or +- host_system.startswith ('darwin') or + host_system.startswith ('irix')) + gl_cv_func_frexpl_works = false + gl_cv_func_frexpl_broken_beyond_repair = true +-- +2.23.0 + |