Commit 54586d56 authored by Nirbheek Chauhan's avatar Nirbheek Chauhan 🐜
Browse files

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.
parent d2056455
......@@ -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', 'meson']
BUILD_TOOLS = ['automake', 'autoconf', 'm4', 'gettext-tools', 'libtool',
'pkg-config', 'orc-tool', 'gettext-m4', 'meson']
PLAT_BUILD_TOOLS = {
Platform.DARWIN: ['intltool', 'yasm', 'bison', 'flex'],
Platform.WINDOWS: ['intltool', 'yasm'],
......
......@@ -7,7 +7,7 @@ class Recipe(recipe.Recipe):
licenses = [License.GPLv2]
stype = SourceType.TARBALL
url = 'https://ftp.gnu.org/gnu/automake/automake-%(version)s.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']
......
......@@ -14,7 +14,7 @@ class Recipe(recipe.Recipe):
url = 'https://ftp.gnu.org/pub/gnu/gettext/gettext-%(version)s.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',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment