diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-07 21:44:47 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-07 21:49:54 +0530 |
| commit | 2a440d1b593211c9532cfa60ecc163a5baeacc54 (patch) | |
| tree | 7ec2010bc8a186c6d1b710225e9465405f95a6da | |
| parent | c8f6e3fa055a40ba55af2ea3a2a7d5505a09f9d1 (diff) | |
gettext-tools.recipe: Needs automake-1.15 on Windows
Also move gettext-tools earlier in the list of build tools so it's
available ASAP.
| -rw-r--r-- | cerbero/bootstrap/build_tools.py | 4 | ||||
| -rw-r--r-- | recipes/build-tools/automake.recipe | 2 | ||||
| -rw-r--r-- | recipes/build-tools/gettext-tools.recipe | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cerbero/bootstrap/build_tools.py b/cerbero/bootstrap/build_tools.py index b6846883..632e2b0a 100644 --- a/cerbero/bootstrap/build_tools.py +++ b/cerbero/bootstrap/build_tools.py @@ -28,8 +28,8 @@ from cerbero.errors import FatalError, ConfigurationError class BuildTools (BootstrapperBase): - BUILD_TOOLS = ['automake', 'autoconf', 'm4', 'libtool', 'pkg-config', - 'orc-tool', 'gettext-m4', 'gettext-tools'] + BUILD_TOOLS = ['automake', 'autoconf', 'm4', 'gettext-tools', 'libtool', + 'pkg-config', 'orc-tool', 'gettext-m4'] PLAT_BUILD_TOOLS = { Platform.DARWIN: ['intltool', 'yasm', 'bison', 'flex'], Platform.WINDOWS: ['intltool', 'yasm'], diff --git a/recipes/build-tools/automake.recipe b/recipes/build-tools/automake.recipe index b8662fa1..3af3cc0f 100644 --- a/recipes/build-tools/automake.recipe +++ b/recipes/build-tools/automake.recipe @@ -7,7 +7,7 @@ class Recipe(recipe.Recipe): licenses = [License.GPLv2] stype = SourceType.TARBALL url = 'http://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.xz' - deps = ['autoconf', 'gettext-tools', 'gettext-m4'] + deps = ['autoconf', 'gettext-m4'] files_bin = ['bin/automake', 'bin/aclocal', 'bin/automake-1.15', 'bin/aclocal-1.15'] diff --git a/recipes/build-tools/gettext-tools.recipe b/recipes/build-tools/gettext-tools.recipe index 63573798..fea240ec 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.19.8.1.tar.gz' platform_deps = { Platform.DARWIN: ['sed'], - Platform.WINDOWS: ['libiconv', 'mingw-runtime'],} + Platform.WINDOWS: ['libiconv', 'mingw-runtime', 'automake'],} configure_options = ' --disable-java --disable-csharp --disable-native-java --without-csv' patches = ['../gettext/0001-Fix-linker-error-redefinition-of-vasprintf.patch', '../gettext/0001-Undefine-__USE_MINGW_ANSI_STDIO-as-otherwise-stdio.h.patch', |