[gnome-ostree] manifest: Use libffi from yocto



commit 8eed2d37564b5085bad0e91037814c2f5face0e0
Author: Colin Walters <walters verbum org>
Date:   Wed Jul 17 11:33:29 2013 -0400

    manifest: Use libffi from yocto
    
    We aren't doing CI on it, so it's probably best there.  While we're
    here, add some syntax I just made up to express external requirements
    for a particular component in the manifest.
    
    The idea is that eventually we can synthesize the base dependencies
    from the manifest.

 manifest.json                |    4 +---
 src/ostree-build-compile-one |    6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 9ff9da3..2b4fd3d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -42,10 +42,8 @@
                 "component": "devel",
                 "noarch": true},
 
-               {"src": "git:git://github.com/atgreen/libffi.git",
-                "tag": "v3.0.10"},
-
                {"src": "gnome:glib",
+                 "requires": {"pkgconfig": ["libffi >= 3.0.10"]},
                  "config-opts": ["--disable-modular-tests",
                                 "--enable-installed-tests"]},
 
diff --git a/src/ostree-build-compile-one b/src/ostree-build-compile-one
index 1241129..1f31d81 100755
--- a/src/ostree-build-compile-one
+++ b/src/ostree-build-compile-one
@@ -129,6 +129,12 @@ def main(args):
 
     configargs.extend(metadata.get('config-opts', []))
 
+    requires = metadata.get('requires', {})
+    pkgconfig_requires = requires.get('pkgconfig', [])
+    if pkgconfig_requires:
+        for req in pkgconfig_requires:
+            run_sync(['pkg-config', '--exists', req])
+
     if metadata.get('rm-configure', False):
         configure_path = 'configure'
         if os.path.exists(configure_path):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]