changeset 4476:b6ef8c18ce12

Support and move most documented prerequisites into tools:: dependencies. TODO: libtiff-dev (for netpbm), libx11-dev (for netpbm), svn (for ghostscript), python-gdbm (for gub: gub/gup.py) this means, btw, that gub does not run with python from local; it lacks gdbm, inkscape (for lilypond doc)]
author Jan Nieuwenhuizen <janneke@gnu.org>
date Fri, 24 Oct 2008 13:53:15 +0200
parents 3d6d2df8fd5a
children e36a846ccdb3
files gub/specs/curl.py gub/specs/expat.py gub/specs/flex.py gub/specs/git.py gub/specs/ncurses.py gub/specs/netpbm.py gub/specs/texinfo.py
diffstat 7 files changed, 33 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/curl.py	Fri Oct 24 13:49:18 2008 +0200
+++ b/gub/specs/curl.py	Fri Oct 24 13:53:15 2008 +0200
@@ -1,9 +1,20 @@
 from gub import targetbuild
+from gub import toolsbuild
 
 class Curl (targetbuild.TargetBuild):
     source = 'http://curl.haxx.se/download/curl-7.19.0.tar.gz'
     def install (self):
         targetbuild.TargetBuild.install (self)
         self.system ('mkdir -p %(install_prefix)s%(cross_dir)s/bin')
-        self.system ('mv %(install_prefix)s/bin/curl-config %(install_prefix)s%(cross_dir)s/bin/curl-config')
-        self.system ('sed -e "s@%(system_prefix)s@%(prefix_dir)s@g" > %(install_prefix)s/bin/curl-config < %(install_prefix)s%(cross_dir)s/bin/curl-config')
+        self.system ('cp %(install_prefix)s/bin/curl-config %(install_prefix)s%(cross_dir)s/bin/curl-config')
+        config_fixup (self)
+    @staticmethod
+    def config_fixup (self):
+        self.file_sub ([('%(system_prefix)s', '%(prefix_dir)s@g')]
+                       , '%(install_prefix)s/bin/curl-config')
+
+class Curl__tools (toolsbuild.ToolsBuild):
+    source = Curl.source
+    def install (self):
+        toolsbuild.ToolsBuild.install (self)
+        Curl.config_fixup (self)
--- a/gub/specs/expat.py	Fri Oct 24 13:49:18 2008 +0200
+++ b/gub/specs/expat.py	Fri Oct 24 13:53:15 2008 +0200
@@ -7,7 +7,7 @@
     source = mirrors.with_template (name='expat', version='1.95.8', mirror=mirrors.sf, format='gz')
 
     def get_build_dependencies (self):
-        return ['libtool']
+        return ['libtool', 'tools::expat']
 
     def patch (self):
         self.system ("rm %(srcdir)s/configure")
--- a/gub/specs/flex.py	Fri Oct 24 13:49:18 2008 +0200
+++ b/gub/specs/flex.py	Fri Oct 24 13:53:15 2008 +0200
@@ -1,13 +1,9 @@
 from gub import toolsbuild
-from gub import sources
-from gub import mirrors
 
-class Flex (toolsbuild.ToolsBuild):
-    source = sources.join (sources.sf, 'flex/flex-2.5.33.tar.gz')
-    auto_source = mirrors.with_template (name='flex', version="2.5.4a",
-                   mirror=mirrors.sf, format='gz'),
-    def srcdir (self):
-        return '%(allsrcdir)s/flex-2.5.4'
+class Flex__tools (toolsbuild.ToolsBuild):
+    source = 'http://surfnet.dl.sourceforge.net/sourceforge/flex/flex-2.5.33.tar.gz'
+    def get_build_dependencies (self):
+        return ['bison']
     def install_command (self):
         return self.broken_install_command ()
     def packaging_suffix_dir (self):
--- a/gub/specs/git.py	Fri Oct 24 13:49:18 2008 +0200
+++ b/gub/specs/git.py	Fri Oct 24 13:53:15 2008 +0200
@@ -6,6 +6,8 @@
 class Git__tools (toolsbuild.ToolsBuild):
     source = mirrors.with_template (name='git', mirror='http://kernel.org/pub/software/scm/git/git-%(version)s.tar.bz2',
                    version='1.5.3.6')
+    def get_build_dependencies (self):
+        return ['curl', 'expat']
     def configure (self):
         self.dump ('prefix=%(system_prefix)s', '%(builddir)s/config.mak')
 
--- a/gub/specs/ncurses.py	Fri Oct 24 13:49:18 2008 +0200
+++ b/gub/specs/ncurses.py	Fri Oct 24 13:53:15 2008 +0200
@@ -1,7 +1,13 @@
 from gub import targetbuild
-from gub import mirrors
+from gub import toolsbuild
 
 class Ncurses (targetbuild.TargetBuild):
-    source = mirrors.with_template (name='ncurses', mirror=mirrors.gnu, version='5.5')
+    source = 'ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.5.tar.gz'
     def license_files (self):
         return '%(srcdir)s/README'
+
+class Ncurses__tools (toolsbuild.ToolsBuild):
+    source = Ncurses.source
+    def license_files (self):
+        return '%(srcdir)s/README'
+
--- a/gub/specs/netpbm.py	Fri Oct 24 13:49:18 2008 +0200
+++ b/gub/specs/netpbm.py	Fri Oct 24 13:53:15 2008 +0200
@@ -15,6 +15,9 @@
             module='stable',
             revision="172")
 
+    def get_build_dependencies (self):
+        return ['libjpeg'] # libtiff-dev libx11-dev
+
     def configure (self):
         self.shadow_tree ('%(srcdir)s', '%(builddir)s')
         self.dump ('\n'*3 + 'static\n' + '\n'*18, '%(builddir)s/answers')
--- a/gub/specs/texinfo.py	Fri Oct 24 13:49:18 2008 +0200
+++ b/gub/specs/texinfo.py	Fri Oct 24 13:53:15 2008 +0200
@@ -4,3 +4,5 @@
 class Texinfo__tools (toolsbuild.ToolsBuild):
     source = mirrors.with_template (name='texinfo', version="4.11",
                                     mirror=mirrors.gnu, format="bz2")
+    def get_build_dependencies (self):
+        return ['ncurses']