diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-07-28 07:54:07 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-07-28 07:54:07 +0000 |
| commit | c3e0feab15a79abcbf3121ea15eecc600d6da0cc (patch) | |
| tree | c4288964fec84443d9a29448589f39603f909dd4 /app-benchmarks | |
| parent | Fix for ncurses[tinfo], bug #553850 (diff) | |
| download | gentoo-2-c3e0feab15a79abcbf3121ea15eecc600d6da0cc.tar.gz gentoo-2-c3e0feab15a79abcbf3121ea15eecc600d6da0cc.tar.bz2 gentoo-2-c3e0feab15a79abcbf3121ea15eecc600d6da0cc.zip | |
Fix for ncurses[tinfo], bug #553850
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'app-benchmarks')
| -rw-r--r-- | app-benchmarks/i7z/ChangeLog | 8 | ||||
| -rw-r--r-- | app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch | 22 | ||||
| -rw-r--r-- | app-benchmarks/i7z/i7z-0.27.2.ebuild | 12 |
3 files changed, 34 insertions, 8 deletions
diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog index 9f4d522670b5..38ba1f59bc43 100644 --- a/app-benchmarks/i7z/ChangeLog +++ b/app-benchmarks/i7z/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-benchmarks/i7z -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.20 2013/12/27 21:38:05 tomwij Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.21 2015/07/28 07:54:07 jlec Exp $ + + 28 Jul 2015; Justin Lecher <jlec@gentoo.org> +files/i7z-0.27.2-ncurses.patch, + i7z-0.27.2.ebuild: + Fix for ncurses[tinfo], bug #553850 27 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/i7z-0.27.1-gentoo.patch: [QA] Remove unused files. diff --git a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch new file mode 100644 index 000000000000..2d0a5a1e9b87 --- /dev/null +++ b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch @@ -0,0 +1,22 @@ +Index: Makefile +=================================================================== +--- Makefile (revision 109) ++++ Makefile (working copy) +@@ -19,7 +19,7 @@ + + CC ?= gcc + +-LIBS += -lncurses -lpthread -lrt -lm ++LIBS += `pkg-config --libs ncurses` -lpthread -lrt -lm + INCLUDEFLAGS = + + BIN = i7z +@@ -42,7 +42,7 @@ + + #http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644728 for -ltinfo on debian + static-bin: message $(OBJ) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread -lncurses -lrt -lm -ltinfo ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread `pkg-config --static --libs ncurses` -lrt -lm + + # perfmon-bin: message $(OBJ) + # $(CC) $(CFLAGS) $(LDFLAGS) -o $(PERFMON-BIN) perfmon-i7z.c helper_functions.c $(LIBS) diff --git a/app-benchmarks/i7z/i7z-0.27.2.ebuild b/app-benchmarks/i7z/i7z-0.27.2.ebuild index 71a41a4333c3..23be3e59e057 100644 --- a/app-benchmarks/i7z/i7z-0.27.2.ebuild +++ b/app-benchmarks/i7z/i7z-0.27.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.27.2.ebuild,v 1.5 2013/03/02 19:12:23 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.27.2.ebuild,v 1.6 2015/07/28 07:54:07 jlec Exp $ -EAPI=4 +EAPI=5 -inherit eutils flag-o-matic qt4-r2 toolchain-funcs +inherit eutils flag-o-matic qmake-utils toolchain-funcs DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux" HOMEPAGE="http://code.google.com/p/i7z/" @@ -21,6 +21,7 @@ RDEPEND=" DEPEND="${RDEPEND}" src_prepare() { + epatch "${FILESDIR}"/${P}-ncurses.patch tc-export CC } @@ -28,8 +29,7 @@ src_compile() { default if use X; then cd GUI - eqmake4 ${PN}_GUI.pro - emake clean && emake + eqmake4 ${PN}_GUI.pro && emake clean && emake fi } |