Mercurial > gub
changeset 5470:d2d22f00f8a2
Promote 'dash' usage into autoupdate command. Fixes stray bash usage.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Tue, 18 Aug 2009 22:15:56 +0200 |
| parents | db9967e36fa9 |
| children | 54153c716744 |
| files | gub/commands.py gub/specs/denemo.py gub/specs/fontconfig.py gub/specs/guile.py gub/specs/librestrict.py gub/specs/libtool.py |
| diffstat | 6 files changed, 3 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/commands.py Tue Aug 18 22:15:16 2009 +0200 +++ b/gub/commands.py Tue Aug 18 22:15:56 2009 +0200 @@ -358,7 +358,7 @@ noconfigure = ' --help' if '--noconfigure' in s: noconfigure = ' --noconfigure' + noconfigure - self.system ('cd %(autodir)s && NOCONFIGURE=1 bash autogen.sh %(noconfigure)s' % locals (), + self.system ('cd %(autodir)s && NOCONFIGURE=1 dash autogen.sh %(noconfigure)s' % locals (), logger) else: libtoolize = misc.path_find (PATH, 'libtoolize')
--- a/gub/specs/denemo.py Tue Aug 18 22:15:16 2009 +0200 +++ b/gub/specs/denemo.py Tue Aug 18 22:15:56 2009 +0200 @@ -24,8 +24,6 @@ '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 ()
--- a/gub/specs/fontconfig.py Tue Aug 18 22:15:16 2009 +0200 +++ b/gub/specs/fontconfig.py Tue Aug 18 22:15:56 2009 +0200 @@ -28,8 +28,6 @@ def patch (self): 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 dash autogen.sh --noconfigure') @context.subst_method def freetype_cflags (self): # this is shady: we're using the flags from the tools version @@ -198,8 +196,6 @@ 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="" ')
--- a/gub/specs/guile.py Tue Aug 18 22:15:16 2009 +0200 +++ b/gub/specs/guile.py Tue Aug 18 22:15:56 2009 +0200 @@ -123,10 +123,6 @@ Guile.__init__ (self, settings, source) # Configure (compile) without -mwindows for console self.target_gcc_flags = '-mms-bitfields' - def Xmakeflags (self): - # hack for (only) running libtool under dash-librestrict. - return (Guile.makeflags (self) - + ''' 'LIBTOOL=%(tools_prefix)s/bin/dash $(top_builddir)/libtool' ''') def _get_build_dependencies (self): return Guile._get_build_dependencies (self) + ['regex-devel'] def configure_command (self):
--- a/gub/specs/librestrict.py Tue Aug 18 22:15:16 2009 +0200 +++ b/gub/specs/librestrict.py Tue Aug 18 22:15:56 2009 +0200 @@ -16,7 +16,7 @@ # restrictions using LIBRESTRICT=open:stat, uninstall dash and # coreutils. This avoids triggering of any open(2) # restrictions on common commands. - relax_restrictions = ['coreutils', 'dash'] + relax_restrictions = ['coreutils', 'bash'] if 'stat' in self.librestrict_flavours (): relax_restrictions = [] return {'': [
--- a/gub/specs/libtool.py Tue Aug 18 22:15:16 2009 +0200 +++ b/gub/specs/libtool.py Tue Aug 18 22:15:56 2009 +0200 @@ -54,7 +54,7 @@ ''') def configure_command (self): # libtool's build breaks with SHELL=; CONFIG_SHELL works - # and adds dash to libtools' #! + # and adds bash to libtools' #! SHELL = '' if 'stat' in misc.librestrict (): SHELL = 'CONFIG_SHELL=%(tools_prefix)s/bin/dash '