--- a/gub/specs/file.py	Thu Aug 20 23:11:48 2009 +0200
+++ b/gub/specs/file.py	Fri Aug 21 00:53:01 2009 +0200
@@ -7,3 +7,4 @@
     def configure_command (self):
         return (tools.AutoBuild.configure_command (self)
                 + ''' LDFLAGS='-L%(system_prefix)s/lib %(rpath)s' ''')
+    

--- a/gub/specs/fontconfig.py	Thu Aug 20 23:11:48 2009 +0200
+++ b/gub/specs/fontconfig.py	Fri Aug 21 00:53:01 2009 +0200
@@ -27,8 +27,7 @@
         target.AutoBuild.__init__ (self, settings, source)
         if 'stat' in misc.librestrict ():
             build.add_dict (self, {'LIBRESTRICT_IGNORE': '%(tools_prefix)s/bin/bash:%(tools_prefix)s/bin/make'})
-            build.add_dict (self, {'LIBRESTRICT_ALLOW': os.environ.get ('HOME', '')})
-            #build.add_dict (self, {'LIBRESTRICT_VERBOSE': '1'})
+            # build.add_dict (self, {'LIBRESTRICT_VERBOSE': '1'})
     def patch (self):
         self.dump ('\nAC_SUBST(LT_AGE)', '%(srcdir)s/configure.in', mode='a', permissions=octal.o755)
         target.AutoBuild.patch (self)
@@ -90,10 +89,10 @@
         libs = '%(freetype_libs)s'
         relax = ''
         if 'stat' in misc.librestrict ():
-            relax = 'LIBRESTRICT_IGNORE=%(tools_prefix)s/bin/make '
+            relax = 'LIBRESTRICT_IGNORE=%(tools_prefix)s/bin/bash:%(tools_prefix)s/bin/make '
         for i in ('fc-case', 'fc-lang', 'fc-glyphname', 'fc-arch'):
             self.system ('''
-cd %(builddir)s/%(i)s && %(relax)s make "CFLAGS=%(cflags)s" "LIBS=%(libs)s" CPPFLAGS= LDFLAGS= INCLUDES= 
+cd %(builddir)s/%(i)s && %(relax)s make "CFLAGS=%(cflags)s" "LIBS=%(libs)s" CPPFLAGS= LD_LIBRARY_PATH=%(tools_prefix)s/lib LDFLAGS=-L%(tools_prefix)s/lib INCLUDES=
 ''', locals ())
         target.AutoBuild.compile (self)
     def install (self):

--- a/gub/specs/gettext.py	Thu Aug 20 23:11:48 2009 +0200
+++ b/gub/specs/gettext.py	Fri Aug 21 00:53:01 2009 +0200
@@ -6,6 +6,21 @@
     source = 'ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.15.tar.gz'
     def _get_build_dependencies (self):
         return ['libtool']
+    def LD_PRELOAD (self):
+        return '' # give up
+    def config_cache_overrides (self, string):
+        return (string
+                + '''
+ac_cv_prog_YACC=${ac_cv_prog_YACC=no}
+ac_cv_prog_INTLBISON=${ac_cv_prog_INTLBISON=no}
+ac_cv_prog_F77=${ac_cv_prog_F77=no}
+ac_cv_prog_FC=${ac_cv_prog_FC=no}
+ac_cv_prog_GCJ=${ac_cv_prog_GCJ=no}
+ac_cv_prog_GC=${ac_cv_prog_GC=no}
+ac_cv_prog_HAVE_GCJ_IN_PATH=${ac_cv_prog_HAVE_GCJ_IN_PATH=no}
+ac_cv_prog_HAVE_JAVAC_IN_PATH=${ac_cv_prog_HAVE_JAVAC_IN_PATH=no}
+ac_cv_prog_HAVE_JIKES_IN_PATH=${ac_cv_prog_HAVE_JIKES_IN_PATH=no}
+''')
     def configure_command (self):
         return (target.AutoBuild.configure_command (self)
                 + ' --disable-threads --disable-csharp --disable-java '
@@ -42,10 +57,11 @@
 
 class Gettext__mingw (Gettext):
     patches = ['gettext-0.15-mingw.patch']
-    def config_cache_overrides (self, str):
-        return (re.sub ('ac_cv_func_select=yes', 'ac_cv_func_select=no',
-               str)
-            + '''
+    def config_cache_overrides (self, string):
+        return (Gettext.config_cache_overrides (self, string)
+                + re.sub ('ac_cv_func_select=yes', 'ac_cv_func_select=no',
+                          string)
+                + '''
 # only in additional library -- do not feel like patching right now
 gl_cv_func_mbrtowc=${gl_cv_func_mbrtowc=no}
 jm_cv_func_mbrtowc=${jm_cv_func_mbrtowc=no}

--- a/gub/specs/gmp.py	Thu Aug 20 23:11:48 2009 +0200
+++ b/gub/specs/gmp.py	Fri Aug 21 00:53:01 2009 +0200
@@ -1,5 +1,7 @@
 import re
 #
+from gub import build
+from gub import misc
 from gub import target
 from gub import tools
 
@@ -9,6 +11,8 @@
         target.AutoBuild.__init__ (self, settings, source)
         if not self.settings.platform.startswith ('darwin'):
             self.target_architecture = re.sub ('i[0-9]86-', 'i386-', settings.target_architecture)
+        if 'stat' in misc.librestrict ():
+            build.add_dict (self, {'LIBRESTRICT_IGNORE': '%(tools_prefix)s/bin/bash'})
     def _get_build_dependencies (self):
         return ['libtool', 'tools::autoconf', 'tools::automake', 'tools::bison', 'tools::flex', 'tools::libtool']
     def configure_command (self):

--- a/gub/specs/libpng.py	Thu Aug 20 23:11:48 2009 +0200
+++ b/gub/specs/libpng.py	Fri Aug 21 00:53:01 2009 +0200
@@ -16,6 +16,9 @@
         self.file_sub ([('(@INSTALL.*)@PKGCONFIGDIR@',
                 r'\1${DESTDIR}@PKGCONFIGDIR@')],
                '%(srcdir)s/Makefile.am')
+    def configure_command (self):
+        return ('LIBRESTRICT_ALLOW=/var/mail '
+                + target.AutoBuild.configure_command (self))
     def compile_command (self):
         c = target.AutoBuild.compile_command (self)
         ## need to call twice, first one triggers spurious Automake stuff.