changeset 5416:9cecc71c5ae9

ncurses: sh build fix.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Sun, 26 Jul 2009 23:06:14 +0200
parents 878e99dba782
children 0ba2db863c64
files gub/specs/ncurses.py patches/ncurses-5.5-sh.patch
diffstat 2 files changed, 30 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/ncurses.py	Sun Jul 26 23:05:52 2009 +0200
+++ b/gub/specs/ncurses.py	Sun Jul 26 23:06:14 2009 +0200
@@ -3,6 +3,7 @@
 
 class Ncurses (target.AutoBuild):
     source = 'ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.5.tar.gz'
+    patches = ['ncurses-5.5-sh.patch']
     def _get_build_dependencies (self):
         return [
 #            'system::g++'
@@ -13,10 +14,13 @@
                 + ' --without-normal'
                 + ' --with-shared'
                 )
+    def makeflags (self):
+        return 'SCRIPT_SHELL=/bin/bash'
     def license_files (self):
         return ['%(srcdir)s/README']
 
 class Ncurses__tools (tools.AutoBuild, Ncurses):
+    patches = Ncurses.patches
     def configure_command (self):
         return (tools.AutoBuild.configure_command (self)
                 + ' --with-normal'
@@ -29,5 +33,7 @@
 #            'system::g++'
             'gawk',
             ]
+    def makeflags (self):
+        return 'SCRIPT_SHELL=/bin/bash'
     def license_files (self):
         return ['%(srcdir)s/README']
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ncurses-5.5-sh.patch	Sun Jul 26 23:06:14 2009 +0200
@@ -0,0 +1,24 @@
+--- ncurses-5.5/include/Makefile.in~	2001-12-08 19:50:06.000000000 +0100
++++ ncurses-5.5/include/Makefile.in	2009-07-24 19:03:21.946018599 +0200
+@@ -87,7 +87,7 @@ curses.h : $(TERMINFO_CAPS) \
+ 		$(srcdir)/curses.tail \
+ 		$(srcdir)/MKkey_defs.sh
+ 	cat curses.head >$@
+-	AWK=$(AWK) sh $(srcdir)/MKkey_defs.sh $(TERMINFO_CAPS) >>$@
++	AWK=$(AWK) $(SCRIPT_SHELL) $(srcdir)/MKkey_defs.sh $(TERMINFO_CAPS) >>$@
+ 	sh -c 'if test "@NCURSES_CH_T@" = "cchar_t" ; then cat $(srcdir)/curses.wide >>$@ ; fi'
+ 	cat $(srcdir)/curses.tail >>$@
+ 
+@@ -99,10 +99,10 @@ hashsize.h: $(TERMINFO_CAPS) $(srcdir)/M
+ 	sh $(srcdir)/MKhashsize.sh $(TERMINFO_CAPS) >$@
+ 
+ ncurses_def.h: $(srcdir)/ncurses_defs $(srcdir)/MKncurses_def.sh
+-	AWK=$(AWK) sh $(srcdir)/MKncurses_def.sh $(srcdir)/ncurses_defs >$@
++	AWK=$(AWK) $(SCRIPT_SHELL) $(srcdir)/MKncurses_def.sh $(srcdir)/ncurses_defs >$@
+ 
+ parametrized.h: $(TERMINFO_CAPS) $(srcdir)/MKparametrized.sh
+-	AWK=$(AWK) sh $(srcdir)/MKparametrized.sh $(TERMINFO_CAPS) >$@
++	AWK=$(AWK) $(SCRIPT_SHELL) $(srcdir)/MKparametrized.sh $(TERMINFO_CAPS) >$@
+ 
+ tags:
+ 	ctags *.[ch]