Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in sys-libs/ncurses/files: ncurses-5.9-no-I-usr-include.patch |
| Date: | Tue, 31 Mar 2015 04:53:13 |
| Message-Id: | 20150331045305.8DD1414E4F@oystercatcher.gentoo.org |
| 1 | vapier 15/03/31 04:53:02 |
| 2 | |
| 3 | Added: ncurses-5.9-no-I-usr-include.patch |
| 4 | Log: |
| 5 | Fix the inverted leak flag #329537#5 by Arthur Taylor. Fix from upstream for building with -I/usr/include/ncursesw #522586 by Joakim Tjernlund. |
| 6 | |
| 7 | (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: ncurses-5.9-no-I-usr-include.patch |
| 16 | =================================================================== |
| 17 | https://bugs.gentoo.org/522586 |
| 18 | |
| 19 | delete the -I$includedir paths that get added to CPPFLAGS. these are never |
| 20 | needed when building natively or cross-compiling and really get in the way |
| 21 | in both cases (upgrades/cross-compiling/etc...). |
| 22 | |
| 23 | extracted from the upstream change: |
| 24 | http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=9ee3995474454b7d956885e0fe5c8cac2ae25d42#patch5 |
| 25 | |
| 26 | --- a/configure |
| 27 | +++ b/configure |
| 28 | @@ -18596,33 +18596,11 @@ CPPFLAGS="$CPPFLAGS -I. -I../include" |
| 29 | if test "$srcdir" != "."; then |
| 30 | CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include" |
| 31 | fi |
| 32 | -if test "$GCC" != yes; then |
| 33 | - CPPFLAGS="$CPPFLAGS -I\${includedir}" |
| 34 | -elif test "$includedir" != "/usr/include"; then |
| 35 | - if test "$includedir" = '${prefix}/include' ; then |
| 36 | - if test $prefix != /usr ; then |
| 37 | - CPPFLAGS="$CPPFLAGS -I\${includedir}" |
| 38 | - fi |
| 39 | - else |
| 40 | - CPPFLAGS="$CPPFLAGS -I\${includedir}" |
| 41 | - fi |
| 42 | -fi |
| 43 | |
| 44 | ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS" |
| 45 | if test "$srcdir" != "."; then |
| 46 | ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" |
| 47 | fi |
| 48 | -if test "$GCC" != yes; then |
| 49 | - ACPPFLAGS="$ACPPFLAGS -I\${includedir}" |
| 50 | -elif test "$includedir" != "/usr/include"; then |
| 51 | - if test "$includedir" = '${prefix}/include' ; then |
| 52 | - if test $prefix != /usr ; then |
| 53 | - ACPPFLAGS="$ACPPFLAGS -I\${includedir}" |
| 54 | - fi |
| 55 | - else |
| 56 | - ACPPFLAGS="$ACPPFLAGS -I\${includedir}" |
| 57 | - fi |
| 58 | -fi |
| 59 | |
| 60 | ### Build up pieces for makefile rules |
| 61 | echo "$as_me:18628: checking default library suffix" >&5 |