windows: fix more dependencies after the runtime deps change

4 files changed, 2 insertions, 56 deletions

diff --git a/packages/base-system-1.0.package b/packages/base-system-1.0.package
index cb50e76..f4b6767 100644
--- a/packages/base-system-1.0.package
+++ b/packages/base-system-1.0.package
@@ -24,7 +24,7 @@ class Package(package.Package):
 
     platform_files = {
         Platform.WINDOWS: ['gettext:libs:lang', 'libiconv:libs:lang',
-            'winpthreads-runtime', 'mingw', 'libstdc++'],
+            'mingw-runtime'],
         Platform.DARWIN: ['gettext:libs:lang', 'libiconv:libs:lang'],
         Platform.LINUX: [],
         Platform.ANDROID: ['gettext:libs:lang', 'libiconv:libs:lang', 'gnustl'],
diff --git a/packages/base-system.package b/packages/base-system.package
index ebef225..0268e97 100644
--- a/packages/base-system.package
+++ b/packages/base-system.package
@@ -24,8 +24,7 @@ class Package(package.Package):
 
     platform_files = {
         Platform.WINDOWS: ['gettext:libs:lang', 'libiconv:libs:lang',
-            'winpthreads-runtime', 'mingw', 'libcroco:libs', 'librsvg:libs:loader',
-            'libstdc++'],
+            'mingw-runtime', 'libcroco:libs', 'librsvg:libs:loader'],
         Platform.DARWIN: ['gettext:libs:lang', 'libiconv:libs:lang',
             'libcroco:libs', 'librsvg:libs:loader'],
         Platform.LINUX: ['libcroco:libs', 'librsvg:libs:loader'],
diff --git a/recipes/gnutls.recipe b/recipes/gnutls.recipe
index fcf0795..73f88b7 100644
--- a/recipes/gnutls.recipe
+++ b/recipes/gnutls.recipe
@@ -9,9 +9,6 @@ class Recipe(recipe.Recipe):
     licenses = [License.LGPLv3Plus]
     configure_options = "--enable-local-libopts --disable-guile"
     deps = ['zlib', 'nettle', 'libtasn1']
-    platform_deps = {
-        Platform.WINDOWS: ['libstdc++'],
-        }
 
     files_libs = ['libgnutls', 'libgnutlsxx']
     files_libs_extra = ['libgnutls-openssl']
diff --git a/recipes/libstdc++.recipe b/recipes/libstdc++.recipe
deleted file mode 100644
index 0707480..0000000
--- a/recipes/libstdc++.recipe
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-import shutil
-from cerbero.errors import InvalidRecipeError
-
-
-class Recipe(recipe.Recipe):
-    name = 'libstdc++'
-    version = '0.1'
-    licenses = [License.LGPL]
-    btype = BuildType.CUSTOM
-    stype = SourceType.CUSTOM
-    platform_deps = {Platform.WINDOWS: ['mingw', 'winpthreads-runtime']}
-
-    files_libs = ['libstdc++']
-
-    def prepare(self):
-        if self.config.target_platform != Platform.WINDOWS:
-            raise InvalidRecipeError()
-
-    def install(self):
-        # Copy libstd++ to the prefix and update the .la files with the
-        # the prefix path.
-        if self.config.platform == Platform.WINDOWS:
-            # the native compiler install dll's in 'bin' and
-            # not in the cross prefix
-            binmingw = 'bin'
-            libmingw = 'lib'
-        else:
-            binmingw = os.path.join(self.config.host, 'lib')
-            libmingw = os.path.join(self.config.host, 'lib')
-        # copy the dll
-        for f in ['libstdc++-6']:
-            shutil.copy(
-                os.path.join(self.config.toolchain_prefix, binmingw, f + '.dll'),
-                os.path.join(self.config.prefix, 'bin', f + '.dll'))
-        # update the .la
-        for f in ['libstdc++']:
-            # Copy the dll.la
-            shutil.copy(
-                os.path.join(self.config.toolchain_prefix, libmingw, f + '.dll.a'),
-                os.path.join(self.config.prefix, 'lib', f + '.dll.a'))
-            src = os.path.join(self.config.toolchain_prefix, libmingw, f + '.la')
-            dest = os.path.join(self.config.prefix, 'lib', f + '.la')
-            if os.path.exists(dest):
-                os.remove(dest)
-            with open(src, 'r') as f:
-                content = f.readlines()[:-1]
-                content.append("libdir='%s'" % os.path.join(self.config.prefix, 'lib'))
-                with open(dest, 'w+') as d:
-                    d.writelines(content)