Mercurial > gub
changeset 4503:aeeca70ddc3f
Add some missing tools::auto* dependencies throughout.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Sat, 25 Oct 2008 09:00:38 +0200 |
| parents | 9bf6233a37d5 |
| children | 014735e1e70f |
| files | gub/specs/faad2.py gub/specs/freetype.py gub/specs/gmp.py gub/specs/libpng.py gub/specs/openoffice.py gub/specs/raptor.py gub/specs/texlive.py gub/specs/xerces-c.py gub/specs/zlib.py |
| diffstat | 9 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/faad2.py Sat Oct 25 08:52:51 2008 +0200 +++ b/gub/specs/faad2.py Sat Oct 25 09:00:38 2008 +0200 @@ -5,6 +5,8 @@ class Faad2 (targetbuild.TargetBuild): source = mirrors.with_tarball (name='faad2', mirror=faac, version='2.5') + def get_build_dependencies (self): + return ['tools::autoconf', 'tools::automake', 'tools::libtool'] def patch (self): self.system (''' cd %(srcdir)s && patch -p0 < %(patchdir)s/faad2-2.5.patch
--- a/gub/specs/freetype.py Sat Oct 25 08:52:51 2008 +0200 +++ b/gub/specs/freetype.py Sat Oct 25 09:00:38 2008 +0200 @@ -17,7 +17,7 @@ return ['%(srcdir)s/docs/LICENSE.TXT'] def get_build_dependencies (self): - return ['libtool-devel', 'zlib-devel'] + return ['libtool-devel', 'zlib-devel', 'tools::autoconf'] def get_subpackage_names (self): return ['devel', '']
--- a/gub/specs/gmp.py Sat Oct 25 08:52:51 2008 +0200 +++ b/gub/specs/gmp.py Sat Oct 25 09:00:38 2008 +0200 @@ -17,7 +17,7 @@ 'doc' : [], } def get_build_dependencies (self): - return ['libtool'] + return ['libtool', 'tools::autoconf', 'tools::automake', 'tools::libtool'] def configure_command (self): c = targetbuild.TargetBuild.configure_command (self)
--- a/gub/specs/libpng.py Sat Oct 25 08:52:51 2008 +0200 +++ b/gub/specs/libpng.py Sat Oct 25 09:00:38 2008 +0200 @@ -7,7 +7,7 @@ return {'':['zlib']} def get_build_dependencies (self): - return ['zlib-devel'] + return ['zlib-devel', 'tools::autoconf', 'tools::automake', 'tools::libtool'] def name (self): return 'libpng'
--- a/gub/specs/openoffice.py Sat Oct 25 08:52:51 2008 +0200 +++ b/gub/specs/openoffice.py Sat Oct 25 09:00:38 2008 +0200 @@ -26,7 +26,7 @@ upstream_patches = ['openoffice-config_office-cross.patch', 'openoffice-config_office-gnu-make.patch', 'openoffice-solenv-cross.patch', 'openoffice-solenv.patch', 'openoffice-sal-cross.patch', 'openoffice-soltools-cross.patch'] def get_build_dependencies (self): # redland-devel - return ['boost-devel', 'curl', 'cppunit-devel', 'db-devel', 'expat-devel', 'fontconfig-devel', 'libjpeg-devel', 'libpng-devel', 'python', 'saxon-java', 'xerces-c', 'zlib-devel'] + return ['tools::autoconf', 'boost-devel', 'curl', 'cppunit-devel', 'db-devel', 'expat-devel', 'fontconfig-devel', 'libjpeg-devel', 'libpng-devel', 'python', 'saxon-java', 'xerces-c', 'zlib-devel'] def stages (self): return misc.list_insert_before (targetbuild.TargetBuild.stages (self), 'compile',
--- a/gub/specs/raptor.py Sat Oct 25 08:52:51 2008 +0200 +++ b/gub/specs/raptor.py Sat Oct 25 09:00:38 2008 +0200 @@ -5,7 +5,7 @@ source = 'http://download.librdf.org/source/raptor-1.4.18.tar.gz' patches = ['raptor-1.4.18-cross.patch'] def get_build_dependencies (self): - return ['expat-devel', 'libxml2-devel'] + return ['expat-devel', 'libxml2-devel', 'tools::autoconf', 'tools::automake', 'tools::libtool'] def autoupdate (self): self.file_sub ([('( |-I|-L)/usr', r'\1%(system_prefix)s')] , '%(srcdir)s/configure.ac')
--- a/gub/specs/texlive.py Sat Oct 25 08:52:51 2008 +0200 +++ b/gub/specs/texlive.py Sat Oct 25 09:00:38 2008 +0200 @@ -23,6 +23,9 @@ module='UnixBuild/source', revision='HEAD')) + def get_build_dependencies (self): + return ['tools::autoconf', 'tools::automake', 'tools::libtool'] + def __init__ (self, settings, source): targetbuild.TargetBuild.__init__ (self, settings, source) def fixed_version (self):
--- a/gub/specs/xerces-c.py Sat Oct 25 08:52:51 2008 +0200 +++ b/gub/specs/xerces-c.py Sat Oct 25 09:00:38 2008 +0200 @@ -4,6 +4,8 @@ class Xerces_c (targetbuild.TargetBuild): source = mirrors.with_tarball (name='xerces-c', mirror=mirrors.xerces_c_2, version='2_8_0') + def get_build_dependencies (self): + return ['tools::autoconf'] def __init__ (self, settings, source): targetbuild.TargetBuild.__init__ (self, settings, source) self.compile_dict = {
--- a/gub/specs/zlib.py Sat Oct 25 08:52:51 2008 +0200 +++ b/gub/specs/zlib.py Sat Oct 25 09:00:38 2008 +0200 @@ -6,12 +6,12 @@ class Zlib (targetbuild.TargetBuild): source = mirrors.with_template (name='zlib', version='1.2.3', mirror='http://heanet.dl.sourceforge.net/sourceforge/libpng/zlib-1.2.3.tar.gz') - + def get_build_dependencies (self): + return ['tools::autoconf'] def patch (self): targetbuild.TargetBuild.patch (self) self.apply_patch ('zlib-1.2.3.patch') self.shadow_tree ('%(srcdir)s', '%(builddir)s') - def compile_command (self): return targetbuild.TargetBuild.compile_command (self) + ' ARFLAGS=r ' def configure_command (self): @@ -23,7 +23,6 @@ zlib_is_broken = 'SHAREDTARGET=libz.so.1.2.3 target=' + stripped_platform ## doesn't use autoconf configure. return zlib_is_broken + ' %(srcdir)s/configure --shared ' - def install_command (self): return targetbuild.TargetBuild.broken_install_command (self) def license_files (self): @@ -36,13 +35,14 @@ ('mgwz','libz'), ], '%(srcdir)s/configure') - def configure_command (self): zlib_is_broken = 'target=mingw' return zlib_is_broken + ' %(srcdir)s/configure --shared ' class Zlib__tools (toolsbuild.ToolsBuild, Zlib): source = Zlib.source + def get_build_dependencies (self): + return ['autoconf'] def patch (self): toolsbuild.ToolsBuild.patch (self) self.apply_patch ('zlib-1.2.3.patch')