summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2013-05-29 09:55:57 (GMT)
committerAndoni Morales Alastruey <ylatuya@gmail.com>2013-05-29 10:00:32 (GMT)
commit50f6e167942e12172b7c8a35631d55ca78c91b82 (patch)
tree43df16c52118131289646811898df5bd7002a2fb
parentaf49526999b24b399f30b2e967c4a98562887fb3 (diff)
downloadcerbero-50f6e167942e12172b7c8a35631d55ca78c91b82.tar.gz
cerbero-50f6e167942e12172b7c8a35631d55ca78c91b82.tar.xz
gio-querymodules: fix build in os x for non-universal builds
-rw-r--r--recipes/glib-networking.recipe11
1 files changed, 5 insertions, 6 deletions
diff --git a/recipes/glib-networking.recipe b/recipes/glib-networking.recipe
index 1f953b3..9deabcd 100644
--- a/recipes/glib-networking.recipe
+++ b/recipes/glib-networking.recipe
@@ -1,7 +1,5 @@
# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-
import os
-from cerbero.errors import FatalError
class Recipe(recipe.Recipe):
name = 'glib-networking'
@@ -14,13 +12,14 @@ class Recipe(recipe.Recipe):
files_lang = ['glib-networking']
def prepare(self):
- querymodule_path = None
+ querymodule_path = os.path.join(self.config.prefix, 'bin', 'gio-querymodules')
if self.config.target_platform in [Platform.DARWIN, Platform.IOS]:
# For the universal build we need to use the right gio-querymodules
arch = self.config.target_arch
- querymodule_path = os.path.join(self.config.prefix, arch, 'bin', 'gio-querymodules')
- else:
- querymodule_path = os.path.join(self.config.prefix, 'bin', 'gio-querymodules')
+ arch_path = os.path.join(self.config.prefix, arch, 'bin', 'gio-querymodules')
+ # Only for the universal builds
+ if os.path.exists(arch_path):
+ querymodule_path = arch_path
if not self.config.prefix_is_executable():
querymodule_path = 'true'