diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-06-17 14:20:03 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-06-17 14:20:03 +0000 |
| commit | 744daacb9353e0826d746a98702c94875d75f054 (patch) | |
| tree | f5b2f67212ec45a339dc3281efc1525f520be77e /devel/ncurses | |
| parent | 73f4ccb2d1f0b8e57e1148b15fe7dff3442c4321 (diff) | |
| download | pkgsrc-744daacb9353e0826d746a98702c94875d75f054.tar.gz | |
Pull in upstream fix for GCC 5.1. Patch submitted by Travis Paul
in joyent/pkgsrc#269.
Diffstat (limited to 'devel/ncurses')
| -rw-r--r-- | devel/ncurses/distinfo | 3 | ||||
| -rw-r--r-- | devel/ncurses/patches/patch-ncurses_base_MKlib__gen.sh | 33 |
2 files changed, 35 insertions, 1 deletions
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo index aaaaf0bb053..ff4fbe46f84 100644 --- a/devel/ncurses/distinfo +++ b/devel/ncurses/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2015/02/18 03:10:41 sevan Exp $ +$NetBSD: distinfo,v 1.26 2015/06/17 14:20:03 jperkin Exp $ SHA1 (ncurses-5.9.tar.gz) = 3e042e5f2c7223bffdaac9646a533b8c758b65b5 RMD160 (ncurses-5.9.tar.gz) = dd7dffe38fcc908230ce3e036b71ced2d270ac9e @@ -9,4 +9,5 @@ SHA1 (patch-ac) = 37215c0930db9cc234c7a59a4c56cbeade6cf5f1 SHA1 (patch-ad) = 15d74d0105a22d0cb1aef5c841e6a6085c498bfe SHA1 (patch-cxx_cursesf.h) = ed10202764d97d7d94d4eb4b35e84424cabc4c20 SHA1 (patch-cxx_cursesm.h) = 0b371901959ce9e36493e57d8df65356284b9ef3 +SHA1 (patch-ncurses_base_MKlib__gen.sh) = f8ce67fbd273529e4161a2820677d05a623fd527 SHA1 (patch-ncurses_tinfo_lib__baudrate.c) = faaf60ec21e9e4e6a4b14d9f245e569b526572df diff --git a/devel/ncurses/patches/patch-ncurses_base_MKlib__gen.sh b/devel/ncurses/patches/patch-ncurses_base_MKlib__gen.sh new file mode 100644 index 00000000000..2441f32766e --- /dev/null +++ b/devel/ncurses/patches/patch-ncurses_base_MKlib__gen.sh @@ -0,0 +1,33 @@ +$NetBSD: patch-ncurses_base_MKlib__gen.sh,v 1.1 2015/06/17 14:20:03 jperkin Exp $ + +* Pull in upstream fix for GCC 5.1 (http://trac.sagemath.org/ticket/18301) + +--- ncurses/base/MKlib_gen.sh.orig 2015-06-16 02:49:42.375000000 +0000 ++++ ncurses/base/MKlib_gen.sh +@@ -437,11 +437,22 @@ sed -n -f $ED1 \ + -e 's/gen_$//' \ + -e 's/ / /g' >>$TMP + ++cat >$ED1 <<EOF ++s/ / /g ++s/^ // ++s/ $// ++s/P_NCURSES_BOOL/NCURSES_BOOL/g ++EOF ++ ++# A patch discussed here: ++# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html ++# introduces spurious #line markers. Work around that by ignoring the system's ++# attempt to define "bool" and using our own symbol here. ++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 \ |