diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-11-16 16:29:12 +0100 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-11-16 16:29:12 +0100 |
| commit | fae100c98bcfb00cadae3de45c0a2c556b12040c (patch) | |
| tree | a69513b682924d71596cd29a1b059fa0e9412047 | |
| parent | 1744cdb000acb143e49b72e975a21174411f4c59 (diff) | |
bootstrap: try to fix the windows build a little bit more
| -rw-r--r-- | recipes/build-tools/autoconf.recipe | 4 | ||||
| -rw-r--r-- | recipes/build-tools/libiconv.recipe | 24 | ||||
| -rw-r--r-- | recipes/build-tools/pkg-config.recipe | 4 |
3 files changed, 4 insertions, 28 deletions
diff --git a/recipes/build-tools/autoconf.recipe b/recipes/build-tools/autoconf.recipe index e6d59187..388245cb 100644 --- a/recipes/build-tools/autoconf.recipe +++ b/recipes/build-tools/autoconf.recipe @@ -16,3 +16,7 @@ class Recipe(recipe.Recipe): 'bin/ifnames'] files_share = ['share/autoconf'] + + def prepare(self): + if self.config.target_platform == Platform.WINDOWS: + self.deps.remove('m4') diff --git a/recipes/build-tools/libiconv.recipe b/recipes/build-tools/libiconv.recipe deleted file mode 100644 index 7a011fc7..00000000 --- a/recipes/build-tools/libiconv.recipe +++ /dev/null @@ -1,24 +0,0 @@ -# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python - - -class Recipe(recipe.Recipe): - name = 'libiconv-tool' - version = '1.14+2012-07-01' - # only libraries are LGPLv2+, tools are GPLv3+ and defined below - licenses = [License.LGPLv2Plus] - configure_options = '--disable-nls --enable-static' - platform_deps = {Platform.WINDOWS: ['gettext']} - autoreconf_sh = './autogen.sh --skip-gnulib' - deps=['gperf'] - - files_bins = ['iconv', ] - licenses_bins = [License.GPLv3Plus] - files_libs = ['libiconv', 'libcharset', ] - files_devel = ['include/iconv.h', 'include/libcharset.h', - 'include/localcharset.h' ] - files_lang = ['libiconv'] - - def prepare(self): - self.remotes['origin'] = ('%s/%s.git' % (self.config.git_root, 'libiconv')) - if self.config.target_platform == Platform.ANDROID: - self.autoreconf = True diff --git a/recipes/build-tools/pkg-config.recipe b/recipes/build-tools/pkg-config.recipe index a8b9a0f1..1c601d1e 100644 --- a/recipes/build-tools/pkg-config.recipe +++ b/recipes/build-tools/pkg-config.recipe @@ -6,10 +6,6 @@ class Recipe(recipe.Recipe): version = '0.27' licenses = [License.GPLv2] configure_options = '--with-internal-glib' - platform_deps = { - Platform.DARWIN: ['libiconv-tool'], - Platform.WINDOWS: ['libiconv-tool'], - } files_bins = ['pkg-config'] files_share = ['share/aclocal/pkg.m4'] |