recipes: use the new runtime dependenciesruntime-deps

20 files changed, 6 insertions, 49 deletions

diff --git a/recipes/build-tools/gettext-tools.recipe b/recipes/build-tools/gettext-tools.recipe
index 7ea6ed6..412d31c 100644
--- a/recipes/build-tools/gettext-tools.recipe
+++ b/recipes/build-tools/gettext-tools.recipe
@@ -11,7 +11,7 @@ class Recipe(recipe.Recipe):
     url = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.tar.gz'
     platform_deps = {
             Platform.DARWIN:  ['libiconv', 'sed'],
-            Platform.WINDOWS: ['libiconv', 'libstdc++', 'mingw', 'winpthreads-runtime'],}
+            Platform.WINDOWS: ['libiconv', 'mingw-runtime'],}
     configure_options = ' --disable-java --disable-csharp --disable-native-java --without-csv'
 
     def prepare(self):
diff --git a/recipes/build-tools/glib-tools.recipe b/recipes/build-tools/glib-tools.recipe
index 99d8b7a..c4693d0 100644
--- a/recipes/build-tools/glib-tools.recipe
+++ b/recipes/build-tools/glib-tools.recipe
@@ -8,10 +8,6 @@ class Recipe(recipe.Recipe):
     configure_options = ' --enable-static'
     deps = ['libffi', 'zlib']
     can_use_configure_cache = False
-    platform_deps = {Platform.WINDOWS: ['libiconv', 'gettext'],
-                     Platform.DARWIN: ['libiconv', 'gettext'],
-                     Platform.IOS: ['libiconv', 'gettext'],
-                     Platform.ANDROID: ['libiconv', 'gettext']}
 
 
     def prepare(self):
diff --git a/recipes/clutter-gst.recipe b/recipes/clutter-gst.recipe
index d25e4e8..ad34be8 100644
--- a/recipes/clutter-gst.recipe
+++ b/recipes/clutter-gst.recipe
@@ -7,9 +7,6 @@ class Recipe(recipe.Recipe):
     licenses = [License.LGPLv2_1Plus]
     configure_options = "--disable-introspection "
     deps = ['clutter', 'gstreamer', 'gst-plugins-base']
-    platform_deps = {
-        Platform.WINDOWS: ['libstdc++'],
-        }
     use_system_libs = True
     autoreconf = True
 
diff --git a/recipes/clutter.recipe b/recipes/clutter.recipe
index 148dbd9..ddf5007 100644
--- a/recipes/clutter.recipe
+++ b/recipes/clutter.recipe
@@ -8,9 +8,6 @@ class Recipe(recipe.Recipe):
     licenses = [License.LGPLv2_1Plus]
     configure_options = "--disable-introspection "
     deps = ['json-glib', 'cairo', 'atk', 'pango', 'cogl']
-    platform_deps = {
-        Platform.WINDOWS: ['libstdc++'],
-        }
     use_system_libs = True
     autoreconf=True
 
diff --git a/recipes/cogl.recipe b/recipes/cogl.recipe
index bbe7361..23021d0 100644
--- a/recipes/cogl.recipe
+++ b/recipes/cogl.recipe
@@ -9,9 +9,6 @@ class Recipe(recipe.Recipe):
     configure_options = "--disable-introspection "
     use_system_libs = True
     deps = [ 'pango', 'gdk-pixbuf' ]
-    platform_deps = {
-        Platform.WINDOWS: ['libstdc++'],
-        }
     autoreconf = True
 
     files_libs = ['libcogl', 'libcogl-pango']
diff --git a/recipes/flac.recipe b/recipes/flac.recipe
index 0848635..d7bb46a 100644
--- a/recipes/flac.recipe
+++ b/recipes/flac.recipe
@@ -8,7 +8,6 @@ class Recipe(recipe.Recipe):
     # only libraries are Xiph.org (aka BSD-like), tools are GPLv2+ and defined below
     licenses = [License.BSD_like]
     deps = [ 'libogg' ]
-    platform_deps = { Platform.WINDOWS: ['libiconv'] }
     configure_options = ' --disable-cpplibs'
 
     files_libs = ['libFLAC']
diff --git a/recipes/fontconfig.recipe b/recipes/fontconfig.recipe
index d8920db..f04de9f 100644
--- a/recipes/fontconfig.recipe
+++ b/recipes/fontconfig.recipe
@@ -7,8 +7,6 @@ class Recipe(recipe.Recipe):
     version = '2.10.1'
     licenses = [License.MIT]
     deps = ['expat', 'freetype', 'zlib', 'bzip2']
-    platform_deps = { Platform.WINDOWS: ['libiconv'],
-                      Platform.DARWIN: ['libiconv']}
 
     files_libs = ['libfontconfig']
     files_etc = [
@@ -35,4 +33,3 @@ class Recipe(recipe.Recipe):
                     continue
                 os.remove(os.path.join(confddir, f))
                 os.symlink(os.path.join(linksrc, f), os.path.join(confddir, f))
-        
diff --git a/recipes/gettext.recipe b/recipes/gettext.recipe
index de4cf20..faad002 100644
--- a/recipes/gettext.recipe
+++ b/recipes/gettext.recipe
@@ -21,3 +21,5 @@ class Recipe(recipe.Recipe):
         elif self.config.target_platform == Platform.ANDROID:
             self.autoreconf = True
             self.autoreconf_sh = 'cd .. && ./autogen.sh --quick --skip-gnulib'
+        if self.config.target_platform != Platform.LINUX:
+            self.runtime_dep = True
diff --git a/recipes/glib.recipe b/recipes/glib.recipe
index 85d7658..91fc466 100644
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -21,10 +21,6 @@ class Recipe(recipe.Recipe):
     config_sh = 'sh autogen.sh'
     deps = ['libffi', 'zlib']
     can_use_configure_cache = False
-    platform_deps = {Platform.WINDOWS: ['libiconv', 'gettext'],
-                     Platform.DARWIN: ['libiconv', 'gettext'],
-                     Platform.IOS: ['libiconv', 'gettext'],
-                     Platform.ANDROID: ['libiconv', 'gettext']}
 
     files_libs = [
         'libglib-2.0', 'libgio-2.0', 'libgmodule-2.0', 'libgobject-2.0',
diff --git a/recipes/gmp.recipe b/recipes/gmp.recipe
index 8e6e21c..f49862e 100644
--- a/recipes/gmp.recipe
+++ b/recipes/gmp.recipe
@@ -5,9 +5,6 @@ class Recipe(recipe.Recipe):
     name = 'gmp'
     version = '5.0.5'
     licenses = [License.LGPLv3Plus]
-    platform_deps = {
-        Platform.WINDOWS: ['libstdc++'],
-        }
 
     files_libs = ['libgmp']
     files_devel = ['include/gmp.h']
diff --git a/recipes/gnustl.recipe b/recipes/gnustl.recipe
index e07ff4e..3e593a9 100644
--- a/recipes/gnustl.recipe
+++ b/recipes/gnustl.recipe
@@ -10,6 +10,7 @@ class Recipe(recipe.Recipe):
     licenses = [License.LGPLv2_1]
     stype = SourceType.CUSTOM
     btype = BuildType.CUSTOM
+    runtime_dep = True
 
     files_stl = [
             'lib/libgnustl.so']
diff --git a/recipes/gtk.recipe b/recipes/gtk.recipe
index ae7a110..0320e4d 100644
--- a/recipes/gtk.recipe
+++ b/recipes/gtk.recipe
@@ -9,9 +9,6 @@ class Recipe(recipe.Recipe):
     licenses = [License.LGPLv2_1Plus]
     configure_options = '--with-included-immodules '
     deps = ['glib', 'atk', 'pango', 'gdk-pixbuf', 'cairo']
-    platform_deps = {
-        Platform.WINDOWS: ['libstdc++'],
-        }
 
     files_libs = ['libgailutil']
     files_bins = ['gtk-update-icon-cache', 'gtk-query-immodules-2.0']
diff --git a/recipes/libiconv.recipe b/recipes/libiconv.recipe
index 60e31f8..f5a299f 100644
--- a/recipes/libiconv.recipe
+++ b/recipes/libiconv.recipe
@@ -20,3 +20,5 @@ class Recipe(recipe.Recipe):
     def prepare(self):
         if self.config.target_platform == Platform.ANDROID:
             self.autoreconf = True
+        if self.config.target_platform != Platform.LINUX:
+            self.runtime_dep = True
diff --git a/recipes/librsvg.recipe b/recipes/librsvg.recipe
index f2a9e4c..3abcda6 100644
--- a/recipes/librsvg.recipe
+++ b/recipes/librsvg.recipe
@@ -6,9 +6,6 @@ class Recipe(recipe.Recipe):
     version = '2.36.1'
     licenses = [License.LGPLv2]
     deps = ['gdk-pixbuf', 'libcroco', 'gtk+']
-    platform_deps = {
-        Platform.WINDOWS: ['libstdc++'],
-        }
     configure_options = '--enable-introspection=no'
 
     files_libs = ['librsvg-2']
diff --git a/recipes/libvisual.recipe b/recipes/libvisual.recipe
index ef9243c..0ebdf89 100644
--- a/recipes/libvisual.recipe
+++ b/recipes/libvisual.recipe
@@ -7,9 +7,6 @@ class Recipe(recipe.Recipe):
     licenses = [License.LGPLv2_1Plus]
     autoreconf = True
     configure_options = ' --enable-static'
-    platform_deps = {Platform.WINDOWS: ['libiconv', 'gettext'],
-                     Platform.DARWIN: ['libiconv', 'gettext'],
-                     Platform.ANDROID: ['libiconv', 'gettext']}
 
     files_libs = ['libvisual-0.4']
     files_devel = ['include/libvisual-0.4', 'lib/pkgconfig/libvisual-0.4.pc']
diff --git a/recipes/libxml2.recipe b/recipes/libxml2.recipe
index f83be87..c34c5da 100644
--- a/recipes/libxml2.recipe
+++ b/recipes/libxml2.recipe
@@ -7,10 +7,6 @@ class Recipe(recipe.Recipe):
     licenses = [License.MIT]
     deps = [ 'zlib' ]
     autoreconf = True
-    platform_deps = {
-            Platform.WINDOWS: ['libiconv'],
-            Platform.ANDROID: ['libiconv'],
-            }
     files_libs = ['libxml2']
     files_devel = ['include/libxml2', 'lib/xml2Conf.sh', 'bin/xml2-config',
                    'lib/pkgconfig/libxml-2.0.pc', 'bin/xmllint%(bext)s']
diff --git a/recipes/pango.recipe b/recipes/pango.recipe
index 24a80ef..90f353d 100644
--- a/recipes/pango.recipe
+++ b/recipes/pango.recipe
@@ -9,9 +9,6 @@ class Recipe(recipe.Recipe):
     licenses = [License.LGPLv2Plus]
     configure_options = '--with-included-modules --enable-static --disable-gtk-doc'
     deps = ['cairo', 'fontconfig', 'freetype', 'gtk-doc-lite']
-    platform_deps = {
-        Platform.WINDOWS: ['libstdc++'],
-        }
 
     files_libs = ['libpangocairo-1.0', 'libpango-1.0', 'libpangoft2-1.0']
     files_bins = ['pango-querymodules', 'pango-view']
diff --git a/recipes/schroedinger.recipe b/recipes/schroedinger.recipe
index 8e2e11c..6d17cd0 100644
--- a/recipes/schroedinger.recipe
+++ b/recipes/schroedinger.recipe
@@ -7,9 +7,6 @@ class Recipe(recipe.Recipe):
     # either LGPLv2 or GPLv2 or MPLv1.1 or MIT
     licenses = [License.LGPLv2]
     deps = ['orc', 'glib']
-    platform_deps = {
-        Platform.WINDOWS: ['mingw'], # for libstdc++
-        }
     can_use_configure_cache = False
     autoreconf = True
 
diff --git a/recipes/soundtouch.recipe b/recipes/soundtouch.recipe
index 6b71afa..1021842 100644
--- a/recipes/soundtouch.recipe
+++ b/recipes/soundtouch.recipe
@@ -8,10 +8,6 @@ class Recipe(recipe.Recipe):
     licenses = [License.LGPLv2_1Plus]
     autoreconf_sh = './bootstrap'
     autoreconf = True
-    platform_deps = {
-        Platform.ANDROID: ['gnustl'],
-        Platform.WINDOWS: ['libstdc++'],
-        }
 
     files_libs = ['libSoundTouch']
     files_devel = ['include/soundtouch', 'lib/pkgconfig/soundtouch.pc']
diff --git a/recipes/wavpack.recipe b/recipes/wavpack.recipe
index 1e288bc..2bc9518 100644
--- a/recipes/wavpack.recipe
+++ b/recipes/wavpack.recipe
@@ -6,7 +6,6 @@ class Recipe(recipe.Recipe):
     name = 'wavpack'
     version = '4.60.1'
     licenses = [License.BSD_like]
-    platform_deps = { Platform.WINDOWS: ['libiconv'] }
 
     files_libs = ['libwavpack']
     files_bins = ['wavpack']