summaryrefslogtreecommitdiff
path: root/recipes/glib.recipe
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2022-12-29 00:53:26 +0100
committerSebastian Dröge <slomo@coaxion.net>2023-01-12 21:57:08 +0000
commita20e91f3309d03dca0b5b419477f0ec96014da7e (patch)
treeecbaf5e4e2d3cde5396ec1c28702d7459b2b98f5 /recipes/glib.recipe
parent6320aaccc5a0f67fd9c1554a1758d685d859ae2f (diff)
glib: fix duplicate g_trace_* symbols when statically linking android app
g_trace_* symbols were present both in glib and gio. Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/864>
Diffstat (limited to 'recipes/glib.recipe')
-rw-r--r--recipes/glib.recipe2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe
index d9d79982..792b1e22 100644
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -42,6 +42,8 @@ class Recipe(recipe.Recipe):
'glib/0001-gio-gsocket-fix-compiler-warnings-on-armv7-Android.patch',
# TODO upstreaming
'glib/0001-gtypes.h-workaround-for-g_uint64_checked_mul-issue-w.patch',
+ # TODO upstreaming
+ 'glib/0001-gio-fix-duplicate-g_trace_-symbols-in-static-libs-wi.patch',
]
files_libs = [