summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2014-02-07 10:30:49 +0100
committerAndoni Morales Alastruey <ylatuya@gmail.com>2014-02-07 10:54:07 +0100
commitde17d47677b565e439b07bf5f1e8c81651ff2648 (patch)
tree33e8cda4d8790f3b4e768e0769c635ad193f17fd
parentb89a34cedb909113acc0269412ddf9aa22a5a506 (diff)
ios: workaround false positive with Apple's private API
locale_charset is considered private API even though where are providing it. The symbol is renamed to avoid conflicts https://bugzilla.gnome.org/show_bug.cgi?id=723805
-rw-r--r--recipes/gettext.recipe2
-rw-r--r--recipes/libiconv.recipe2
2 files changed, 4 insertions, 0 deletions
diff --git a/recipes/gettext.recipe b/recipes/gettext.recipe
index f5e11d0f..306f4656 100644
--- a/recipes/gettext.recipe
+++ b/recipes/gettext.recipe
@@ -26,3 +26,5 @@ class Recipe(recipe.Recipe):
self.configure_options += ' --enable-threads=win32'
if self.config.target_platform != Platform.LINUX:
self.runtime_dep = True
+ if self.config.target_platform == Platform.IOS:
+ self.append_env['CFLAGS'] = '-Dlocale_charset=intl_locale_charset'
diff --git a/recipes/libiconv.recipe b/recipes/libiconv.recipe
index 65afceab..05d993a0 100644
--- a/recipes/libiconv.recipe
+++ b/recipes/libiconv.recipe
@@ -26,3 +26,5 @@ class Recipe(recipe.Recipe):
def prepare(self):
if self.config.target_platform != Platform.LINUX:
self.runtime_dep = True
+ if self.config.target_platform == Platform.IOS:
+ self.append_env['CFLAGS'] = '-Dlocale_charset=iconv_locale_charset'