Set GLib/pixman configure check overrides in the ios.config instead of recipes

2 files changed, 11 insertions, 15 deletions

diff --git a/config/ios.config b/config/ios.config
index f3e6b1e..3b12e87 100644
--- a/config/ios.config
+++ b/config/ios.config
@@ -65,3 +65,14 @@ if ios_platform == "iPhoneOS":
 if use_ccache:
     os.environ['CC'] += 'ccache gcc'
     os.environ['CXX'] += 'ccache g++'
+
+# For GLib
+os.environ['glib_cv_stack_grows'] = 'yes'
+os.environ['glib_cv_uscore'] = 'no'
+os.environ['ac_cv_func_posix_getpwuid_r'] = 'yes'
+os.environ['ac_cv_func_posix_getgrgid_r'] = 'yes'
+os.environ['gt_cv_c_wchar_t'] = 'no'
+
+# For pixman
+os.environ['ac_cv_tls'] = 'none'
+
diff --git a/recipes/glib.recipe b/recipes/glib.recipe
index 4e7cead..a9e2989 100644
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -120,21 +120,6 @@ class Recipe(recipe.Recipe):
                 from cerbero.errors import FatalError
                 raise FatalError(_("Add specific for other Linux distributions here"))
 
-    def configure(self):
-        if self.config.target_platform == Platform.IOS:
-            # Use a cache file specific to the GLib to make cross compilation possible
-            cache = os.path.join(self.build_dir, ".glib.configure.cache")
-            if not os.path.exists(cache):
-                writer = open(cache, 'w')
-                writer.write("glib_cv_stack_grows=no\n"
-                             "glib_cv_uscore=yes\n"
-                             "ac_cv_func_posix_getpwuid_r=yes\n"
-                             "ac_cv_func_posix_getgrgid_r=yes\n"
-                             "gt_cv_c_wchar_t=no")
-                writer.close()
-            self.configure_options += ' --cache-file=%s' % cache
-        super(recipe.Recipe, self).configure()
-
     def post_install(self):
         import shutil
         if self.config.target_platform == Platform.WINDOWS: