Mercurial > gub

changeset 5353:ddf581857c4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add system::g++ dependency to ncurses. Should catch nasty problems. Wasted a day more or less finding out some [remote keyhole debugged] system lacked g++. Sigh. Quite possibly for this check to really work, we'd also need to check if g++ links, ie libstdc++[.so] is present.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 13 Jul 2009 20:45:30 +0200
parents 57422e18b02c
children 47909366c88e
files gub/specs/imagemagick.py gub/specs/ncurses.py
diffstat 2 files changed, 24 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/imagemagick.py	Mon Jul 13 20:43:45 2009 +0200
+++ b/gub/specs/imagemagick.py	Mon Jul 13 20:45:30 2009 +0200
@@ -7,7 +7,19 @@
     source = 'http://ftp.surfnet.nl/pub/ImageMagick/ImageMagick-6.4.5-4.tar.gz'
 #    source = 'http://ftp.surfnet.nl/pub/ImageMagick/ImageMagick-6.3.7-9.tar.gz'
     def _get_build_dependencies (self):
-        return ['automake', 'bzip2', 'fontconfig', 'ghostscript', 'libpng', 'libjpeg', 'libtiff', 'libxml2', 'libtool', 'zlib']
+        return [
+#            'system::g++',
+            'automake',
+            'bzip2',
+            'fontconfig',
+            'ghostscript',
+            'libpng',
+            'libjpeg',
+            'libtiff',
+            'libxml2',
+            'libtool',
+            'zlib',
+            ]
     def configure_flags (self):
         return (tools.AutoBuild.configure_flags (self)
                 + misc.join_lines ('''
@@ -25,6 +37,8 @@
         pass
 
 class ImageMagick__tools__autoupdate (ImageMagick__tools):
+    def _get_build_dependencies (self):
+        return ['system::g++']
     def XXforce_autoupdate (self):
         # this does not work, ImageMagick adds cruft of its own in ./ltdl
         # and somehow *needs* ./ltdl (1.5.22 will make ./libltdl)
--- a/gub/specs/ncurses.py	Mon Jul 13 20:43:45 2009 +0200
+++ b/gub/specs/ncurses.py	Mon Jul 13 20:45:30 2009 +0200
@@ -4,14 +4,20 @@
 class Ncurses (target.AutoBuild):
     source = 'ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.5.tar.gz'
     def configure_command (self):
-        return (tools.AutoBuild.configure_command (self)
-                + ' --without-normal --with-shared ')
+        return (target.AutoBuild.configure_command (self)
+                + ' --without-normal'
+                + ' --with-shared'
+                )
     def license_files (self):
         return ['%(srcdir)s/README']
 
 class Ncurses__tools (tools.AutoBuild, Ncurses):
     def configure_command (self):
         return (tools.AutoBuild.configure_command (self)
-                + ' --with-normal --with-shared ')
+                + ' --with-normal'
+                + ' --with-shared'
+                )
+    def _get_build_dependencies (self):
+        return ['system::g++']
     def license_files (self):
         return ['%(srcdir)s/README']