diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-11-10 11:40:58 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-11-10 11:40:58 +0000 |
| commit | d8c0433838875c82cab700d2d8e312f4084695c9 (patch) | |
| tree | 15c32e2a9edf63a0b53622db89138ae96484d836 /sys-libs/libstatgrab | |
| parent | Stable for ppc64, wrt bug #506042 (diff) | |
| download | gentoo-2-d8c0433838875c82cab700d2d8e312f4084695c9.tar.gz gentoo-2-d8c0433838875c82cab700d2d8e312f4084695c9.tar.bz2 gentoo-2-d8c0433838875c82cab700d2d8e312f4084695c9.zip | |
Fix building against sys-libs/ncurses[tinfo] (bug #481972).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'sys-libs/libstatgrab')
| -rw-r--r-- | sys-libs/libstatgrab/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/libstatgrab/files/libstatgrab-0.91-tinfo.patch | 43 | ||||
| -rw-r--r-- | sys-libs/libstatgrab/libstatgrab-0.91.ebuild | 7 |
3 files changed, 53 insertions, 3 deletions
diff --git a/sys-libs/libstatgrab/ChangeLog b/sys-libs/libstatgrab/ChangeLog index 2568bec9e9a7..df09a59c0ff4 100644 --- a/sys-libs/libstatgrab/ChangeLog +++ b/sys-libs/libstatgrab/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/libstatgrab # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstatgrab/ChangeLog,v 1.30 2014/10/17 09:41:51 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstatgrab/ChangeLog,v 1.31 2014/11/10 11:40:58 jer Exp $ + + 10 Nov 2014; Jeroen Roovers <jer@gentoo.org> libstatgrab-0.91.ebuild, + +files/libstatgrab-0.91-tinfo.patch: + Fix building against sys-libs/ncurses[tinfo] (bug #481972). *libstatgrab-0.91 (17 Oct 2014) diff --git a/sys-libs/libstatgrab/files/libstatgrab-0.91-tinfo.patch b/sys-libs/libstatgrab/files/libstatgrab-0.91-tinfo.patch new file mode 100644 index 000000000000..b0eb94cbcd8e --- /dev/null +++ b/sys-libs/libstatgrab/files/libstatgrab-0.91-tinfo.patch @@ -0,0 +1,43 @@ +--- a/m4/ax_ncurses.m4 ++++ b/m4/ax_ncurses.m4 +@@ -12,24 +12,31 @@ + + AS_IF([test "x$with_ncurses" != "xno"], [ + AC_CACHE_CHECK([for working ncurses], mp_cv_ncurses, [ +- LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses" ++ LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses -ltinfo" + CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses.h>], [testcode])], [ + mp_cv_ncurses="ncurses.h" +- CURSES_LIB="-lncurses" ++ CURSES_LIB="-lncurses -ltinfo" + ], [ + LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses" + CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], [testcode])], [ +- mp_cv_ncurses="ncurses/ncurses.h" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses.h>], [testcode])], [ ++ mp_cv_ncurses="ncurses.h" + CURSES_LIB="-lncurses" + ], [ +- LIBS="$mp_save_LIBS $SAIDARLIBS -lcurses" ++ LIBS="$mp_save_LIBS $SAIDARLIBS -lncurses" + CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curses.h>], [testcode])], [ +- mp_cv_ncurses="curses.h" +- CURSES_LIB="-lcurses" +- ], [mp_cv_ncurses=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], [testcode])], [ ++ mp_cv_ncurses="ncurses/ncurses.h" ++ CURSES_LIB="-lncurses" ++ ], [ ++ LIBS="$mp_save_LIBS $SAIDARLIBS -lcurses" ++ CPPFLAGS="$mp_save_CPPFLAGS $SAIDARCPPFLAGS" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curses.h>], [testcode])], [ ++ mp_cv_ncurses="curses.h" ++ CURSES_LIB="-lcurses" ++ ], [mp_cv_ncurses=no]) ++ ]) + ]) + ]) + ]) diff --git a/sys-libs/libstatgrab/libstatgrab-0.91.ebuild b/sys-libs/libstatgrab/libstatgrab-0.91.ebuild index 0561753914e6..91556ea80adc 100644 --- a/sys-libs/libstatgrab/libstatgrab-0.91.ebuild +++ b/sys-libs/libstatgrab/libstatgrab-0.91.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstatgrab/libstatgrab-0.91.ebuild,v 1.1 2014/10/17 09:41:51 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstatgrab/libstatgrab-0.91.ebuild,v 1.2 2014/11/10 11:40:58 jer Exp $ -EAPI=4 +EAPI=5 +AUTOTOOLS_AUTORECONF=frob inherit autotools-utils DESCRIPTION="A tool to provide access to statistics about the system on which it's run" @@ -20,6 +21,8 @@ DEPEND="${RDEPEND}" DOCS=( ChangeLog PLATFORMS NEWS AUTHORS README ) +PATCHES=( "${FILESDIR}"/${P}-tinfo.patch ) + src_configure() { local myeconfargs=( --disable-setgid-binaries |