diff options
| author | Jan Schmidt <jan@centricular.com> | 2017-04-24 22:31:28 +1000 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2017-04-24 22:31:28 +1000 |
| commit | ba4532ac941d8117823d818d11d100ebda0efa1b (patch) | |
| tree | 190853a12b60a6af41ce189fb4179152bccf2a7e | |
| parent | 5cf083525e9f7bc0955db8d4a7e4a04a5b9f0b8c (diff) | |
glib: Add a patch for silent error introduced when building without DTrace
| -rw-r--r-- | recipes/build-tools/glib-tools.recipe | 3 | ||||
| -rw-r--r-- | recipes/glib.recipe | 3 | ||||
| -rw-r--r-- | recipes/glib/0019-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch | 33 |
3 files changed, 37 insertions, 2 deletions
diff --git a/recipes/build-tools/glib-tools.recipe b/recipes/build-tools/glib-tools.recipe index d23e885e..ede7b248 100644 --- a/recipes/build-tools/glib-tools.recipe +++ b/recipes/build-tools/glib-tools.recipe @@ -23,7 +23,8 @@ class Recipe(recipe.Recipe): '../glib/0016-gmessages-Fix-compilation-on-Android.patch', '../glib/0017-GSocket-Fix-race-conditions-on-Win32-if-multiple-thr.patch', '../glib/0018-Check-for-RTLD_LAZY-and-others-in-configure.patch', - '../glib/0018-Don-t-use-RTLD_DEFAULT-on-Android-for-g_module_self.patch' + '../glib/0018-Don-t-use-RTLD_DEFAULT-on-Android-for-g_module_self.patch', + '../glib/0019-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch' ] def prepare(self): diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 87eef282..f231d6d2 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -40,7 +40,8 @@ class Recipe(recipe.Recipe): 'glib/0016-gmessages-Fix-compilation-on-Android.patch', 'glib/0017-GSocket-Fix-race-conditions-on-Win32-if-multiple-thr.patch', 'glib/0018-Check-for-RTLD_LAZY-and-others-in-configure.patch', - 'glib/0018-Don-t-use-RTLD_DEFAULT-on-Android-for-g_module_self.patch' + 'glib/0018-Don-t-use-RTLD_DEFAULT-on-Android-for-g_module_self.patch', + 'glib/0019-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch' ] files_libs = [ diff --git a/recipes/glib/0019-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch b/recipes/glib/0019-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch new file mode 100644 index 00000000..8d9ee288 --- /dev/null +++ b/recipes/glib/0019-gmain-Fix-erroneous-if-condition-when-dtrace-is-disa.patch @@ -0,0 +1,33 @@ +From cda76baac0c447a4f3ef5c9a34c15e9b8b586c44 Mon Sep 17 00:00:00 2001 +From: Jan Schmidt <jan@centricular.com> +Date: Mon, 24 Apr 2017 22:24:26 +1000 +Subject: [PATCH] gmain: Fix erroneous if condition when dtrace is disabled + +Add a block around an if statement whose contents disappear +when DTrace support is compiled out, making it erroneously +associate to the next line. +--- + glib/gmain.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/glib/gmain.c b/glib/gmain.c +index c537af4..e0db289 100644 +--- a/glib/gmain.c ++++ b/glib/gmain.c +@@ -1681,11 +1681,12 @@ g_source_set_callback_indirect (GSource *source, + if (context) + LOCK_CONTEXT (context); + +- if (callback_funcs != &g_source_callback_funcs) ++ if (callback_funcs != &g_source_callback_funcs) { + TRACE (GLIB_SOURCE_SET_CALLBACK_INDIRECT (source, callback_data, + callback_funcs->ref, + callback_funcs->unref, + callback_funcs->get)); ++ } + + old_cb_data = source->callback_data; + old_cb_funcs = source->callback_funcs; +-- +2.9.3 + |