summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2013-08-08 17:24:46 +0200
committerAndoni Morales Alastruey <ylatuya@gmail.com>2013-08-08 17:34:13 +0200
commit285f40ba60cbe2021bcd4b74351e8c2a168f200e (patch)
tree67e5ab19d48efc0bcb2a45e2e0c9c6464f124797
parent8ea48d256b160d4008f8912abbdffdccdc884256 (diff)
recipes: don't override CFLAGS in glib and gtk
-rw-r--r--recipes/glib.recipe5
-rw-r--r--recipes/gtk.recipe5
2 files changed, 4 insertions, 6 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe
index 42fd2e9..72f05c4 100644
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -61,13 +61,12 @@ class Recipe(recipe.Recipe):
files_lang = ['glib20']
def _set_gio_flags(self, path1=None, path2=None, use_old_uri_scheme=False):
- self.config_sh = 'CFLAGS="%s" ./configure' % \
- self._gio_flags(path1, path2, use_old_uri_scheme)
+ self.append_env['CFLAGS'] = self._gio_flags(path1, path2, use_old_uri_scheme)
def _gio_flags(self, path1=None, path2=None, use_old_uri_scheme=False):
flags = ''
def escape(path):
- return '\\\\\\\"%s\\\\\\\"' % path
+ return '\\"%s\\"' % path
if path1 is not None:
flags += ' -DGST_SDK_GLIB_GIO_DISTRO_GIO_MODULE_PATH=%s' % escape(path1)
if path2 is not None:
diff --git a/recipes/gtk.recipe b/recipes/gtk.recipe
index a316e1b..427e582 100644
--- a/recipes/gtk.recipe
+++ b/recipes/gtk.recipe
@@ -54,13 +54,12 @@ class Recipe(recipe.Recipe):
def _set_flags(self, module_path1=None, module_path2=None, theme_path=None):
- self.config_sh = 'CFLAGS="%s" ./configure' % \
- self._gtk_flags(module_path1, module_path2, theme_path)
+ self.append_env['CFLAGS'] = self._gtk_flags(module_path1, module_path2, theme_path)
def _gtk_flags(self, module_path1=None, module_path2=None, theme_path=None):
flags = ''
def escape(path):
- return '\\\\\\\"%s\\\\\\\"' % path
+ return '\\"%s\\"' % path
if module_path1 is not None:
flags += ' -DGST_SDK_GTK_DISTRO_GTK_MODULE_PATH=%s' % escape(module_path1)
if module_path2 is not None: