# HG changeset patch
# User Jan Nieuwenhuizen <janneke@gnu.org>
# Date 1250621612 -7200
# Node ID 0ed83fbc18137f4eb1d47c64bd87d13bf22b9bf7
# Parent  0cffa88a3f3690c6340a24ad5cf26b53cd2cbd8f
stat-librestrict fixes.

diff -r 0cffa88a3f36 -r 0ed83fbc1813 gub/specs/denemo.py
--- a/gub/specs/denemo.py	Tue Aug 18 20:52:30 2009 +0200
+++ b/gub/specs/denemo.py	Tue Aug 18 20:53:32 2009 +0200
@@ -24,6 +24,8 @@
         'denemo-srcdir-make.patch',
         'denemo-relocate.patch'
         ]
+    def autoupdate (self):
+        self.system ('cd %(autodir)s && NOCONFIGURE=1 LIBRESTRICT_VERBOSE=1 LIBRESTRICT_IGNORE=%(tools_prefix)s/bin/bash dash autogen.sh --noconfigure')
     @staticmethod
     def version_from_configure_in (self):
         return self.version_from_configure_in ()
@@ -71,6 +73,11 @@
                 + ' --enable-binreloc'
                 + ' --with-jack'
                 + ' --program-prefix=')
+    def compile (self):
+        if isinstance (self.source, repository.Git):
+            # FIXME: missing dependency
+            self.system ('cd %(builddir)s/src && make lylexer.c')
+        target.AutoBuild.compile (self)
     def makeflags (self):
         return 'BINRELOC_CFLAGS=-DENABLE_BINRELOC=1'
 
diff -r 0cffa88a3f36 -r 0ed83fbc1813 gub/specs/fontconfig.py
--- a/gub/specs/fontconfig.py	Tue Aug 18 20:52:30 2009 +0200
+++ b/gub/specs/fontconfig.py	Tue Aug 18 20:53:32 2009 +0200
@@ -29,7 +29,7 @@
         self.dump ('\nAC_SUBST(LT_AGE)', '%(srcdir)s/configure.in', mode='a', permissions=octal.o755)
         target.AutoBuild.patch (self)
     def autoupdate (self):
-        self.system ('cd %(autodir)s && NOCONFIGURE=1 LIBRESTRICT_VERBOSE=1 LIBRESTRICT_IGNORE=%(tools_prefix)s/bin/bash bash autogen.sh --noconfigure')
+        self.system ('cd %(autodir)s && NOCONFIGURE=1 LIBRESTRICT_VERBOSE=1 LIBRESTRICT_IGNORE=%(tools_prefix)s/bin/bash dash autogen.sh --noconfigure')
     @context.subst_method
     def freetype_cflags (self):
         # this is shady: we're using the flags from the tools version
@@ -198,6 +198,8 @@
         tools.AutoBuild.patch (self)
     def _get_build_dependencies (self):
         return ['libtool', 'freetype', 'expat', 'pkg-config']
+    def autoupdate (self):
+        self.system ('cd %(autodir)s && NOCONFIGURE=1 LIBRESTRICT_VERBOSE=1 LIBRESTRICT_IGNORE=%(tools_prefix)s/bin/bash dash autogen.sh --noconfigure')
     def makeflags (self):
         return ('man_MANS=' # either this, or add something like tools::docbook-utils
                 + ' DOCSRC="" ')
diff -r 0cffa88a3f36 -r 0ed83fbc1813 gub/specs/python.py
--- a/gub/specs/python.py	Tue Aug 18 20:52:30 2009 +0200
+++ b/gub/specs/python.py	Tue Aug 18 20:53:32 2009 +0200
@@ -67,16 +67,20 @@
             relax = 'LIBRESTRICT_ALLOW=/usr/lib/python2.4/lib-dynload:${LIBRESTRICT_ALLOW-/foo} '
         return (relax
                 + target.AutoBuild.install_command (self))
+    @context.subst_method
+    def SO_EXTENSION (self):
+        return '.so' #FIXME!
     def install (self):
         target.AutoBuild.install (self)
         misc.dump_python_config (self)
         def assert_fine (logger):
             dynload_dir = self.expand ('%(install_prefix)s/lib/python%(python_version)s/lib-dynload')
-            all = [x.replace (dynload_dir + '/', '') for x in misc.find_files (dynload_dir, '.*.so')]
-            failed = [x.replace (dynload_dir + '/', '') for x in misc.find_files (dynload_dir, '.*failed.so')]
+            so = self.SO_EXTENSION ()
+            all = [x.replace (dynload_dir + '/', '') for x in misc.find_files (dynload_dir, '.*' + so)]
+            failed = [x.replace (dynload_dir + '/', '') for x in misc.find_files (dynload_dir, '.*failed' + so)]
             if failed:
                 logger.write_log ('failed python modules:' + ', '.join (failed), 'error')
-            if not 'struct.so' in all or not 'itertools.so' in all:
+            if not 'struct' + so in all or not 'itertools' + so in all:
                 logger.write_log ('all python modules:' + ', '.join (all), 'error')
                 raise Exception ('Python struct or itertools module failed')
         self.func (assert_fine)
@@ -131,6 +135,9 @@
 ac_cv_sizeof_pthread_t=12
 ''')
 ##$(eval echo $((echo $ac_cv_sizeof_int + $ac_cv_sizeof_void_p)))
+    @context.subst_method
+    def SO_EXTENSION (self):
+        return '.dll' #FIXME!
     def install (self):
         Python.install (self)
         self.file_sub ([('extra = ""', 'extra = "-L%(system_prefix)s/bin -L%(system_prefix)s/lib -lpython2.4 -lpthread"')],