Mercurial > mxe-octave
changeset 4025:703b6f9eaea1
ncurses: add patch for gcc 5
* src/ncurses-1-gcc-5-fix.patch: new file
* dist-files.mk: add ncurses-1-gcc-5-fix.patch
| author | John D |
|---|---|
| date | Sat, 12 Sep 2015 01:56:42 -0400 |
| parents | 8114d05101dc |
| children | 28fa86d2cf21 |
| files | dist-files.mk src/ncurses-1-gcc-5-fix.patch |
| diffstat | 2 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Fri Sep 11 15:22:10 2015 -0400 +++ b/dist-files.mk Sat Sep 12 01:56:42 2015 -0400 @@ -428,6 +428,7 @@ native-gcc-1-float.patch \ native-gcc-2-intrinsics.patch \ native-gcc.mk \ + ncurses-1-gcc-5-fix.patch \ ncurses.mk \ netcdf.mk \ nettle-1-fixes.patch \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ncurses-1-gcc-5-fix.patch Sat Sep 12 01:56:42 2015 -0400 @@ -0,0 +1,26 @@ +diff -ur ncurses-5.9.orig/ncurses/base/MKlib_gen.sh ncurses-5.9/ncurses/base/MKlib_gen.sh +--- ncurses-5.9.orig/ncurses/base/MKlib_gen.sh 2015-09-11 08:07:30.154205355 -0400 ++++ ncurses-5.9/ncurses/base/MKlib_gen.sh 2015-09-11 08:10:59.265578376 -0400 +@@ -436,12 +436,18 @@ + -e 's/^\([a-zA-Z_][a-zA-Z_]*[ *]*\)/\1 gen_/' \ + -e 's/gen_$//' \ + -e 's/ / /g' >>$TMP ++cat >$ED1 <<EOF ++s/ / /g ++s/^ // ++s/ $// ++s/P_NCURSES_BOOL/NCURSES_BOOL/g ++EOF ++ ++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 ++cat $ED2 >$TMP + + $preprocessor $TMP 2>/dev/null \ +-| sed \ +- -e 's/ / /g' \ +- -e 's/^ //' \ +- -e 's/_Bool/NCURSES_BOOL/g' \ ++| sed -f $ED1 \ + | $AWK -f $AW2 \ + | sed -f $ED3 \ + | sed \