diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2015-01-09 10:37:43 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-01-09 10:37:43 +0100 |
| commit | 622d5f13ac24a9ab2e63543d85d295e94937cc67 (patch) | |
| tree | 6b55f999b59ab144165abe9a4fc7fb130330e42b /recipes | |
| parent | f5cac6bd045e3e358c14373cd74e9e697830fecf (diff) | |
glib: Don't use AT_FDCWD on iOS for now
AT_FDCWD is available since XCode 6.1 and cause linking failures
when linking an application later with older XCode versions
https://bugzilla.gnome.org/show_bug.cgi?id=742097
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/glib.recipe | 1 | ||||
| -rw-r--r-- | recipes/glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch | 36 |
2 files changed, 37 insertions, 0 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 681b8059..42d6c0c2 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -38,6 +38,7 @@ class Recipe(recipe.Recipe): 'glib/0001-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch', 'glib/0012-gutils-Don-t-use-issetugid-on-Android.patch', 'glib/0013-grand-Only-use-rand_s-when-targetting-Visual-Studio-.patch', + 'glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch', ] files_libs = [ diff --git a/recipes/glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch b/recipes/glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch new file mode 100644 index 00000000..bee276c9 --- /dev/null +++ b/recipes/glib/0014-Don-t-use-AT_FDCWD-on-iOS-for-now.patch @@ -0,0 +1,36 @@ +From 5e1f1f1f7f5624debe6dc8ebdb155042d20fbc91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Fri, 9 Jan 2015 10:36:27 +0100 +Subject: [PATCH] Don't use AT_FDCWD on iOS for now + +https://bugzilla.gnome.org/show_bug.cgi?id=742097 +--- + gio/glocalfile.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/gio/glocalfile.c b/gio/glocalfile.c +index 846eedb..42bd557 100644 +--- a/gio/glocalfile.c ++++ b/gio/glocalfile.c +@@ -87,6 +87,18 @@ + #endif + #endif + ++#ifdef __APPLE__ ++#include <TargetConditionals.h> ++ ++/* AT_FDCWD is available since XCode 6.1 and cause linking failures ++ * when linking an application later with older XCode versions ++ */ ++#if defined(TARGET_OS_IPHONE) && defined(AT_FDCWD) ++#undef AT_FDCWD ++#endif ++ ++#endif ++ + + static void g_local_file_file_iface_init (GFileIface *iface); + +-- +2.1.4 + |