diff options
-rw-r--r-- | app-benchmarks/i7z/ChangeLog | 4 | ||||
-rw-r--r-- | app-benchmarks/i7z/Manifest | 16 | ||||
-rw-r--r-- | app-benchmarks/i7z/files/9999-gentoo.patch | 25 | ||||
-rw-r--r-- | app-benchmarks/i7z/i7z-9999.ebuild | 7 |
4 files changed, 35 insertions, 17 deletions
diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog index a1a8101..119c19e 100644 --- a/app-benchmarks/i7z/ChangeLog +++ b/app-benchmarks/i7z/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch, + i7z-9999.ebuild: + Fix for current HEAD + 04 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch: Adopted to changes in HEAD diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest index 21c2470..63c5a3c 100644 --- a/app-benchmarks/i7z/Manifest +++ b/app-benchmarks/i7z/Manifest @@ -1,4 +1,14 @@ -AUX 9999-gentoo.patch 1351 RMD160 9834072536b97ac26fb2e35e34aa8f13099934a0 SHA1 583d44c4bdf932d03373c6de96b18a2001f08ef8 SHA256 c37de9cbf30a6fb98c3abc62e57977d2dd0f6e6d42b83691769841efa97c5b63 -EBUILD i7z-9999.ebuild 833 RMD160 f952e743ff6db21273bb3185bb9b36e6cce95a64 SHA1 530f6d1d67797be180bd1b045b65020b1963297f SHA256 1228c6c88afb4e2e95eb7f41ca3956d86282c2da5e7b3e1e0aebefa37a14c174 -MISC ChangeLog 700 RMD160 d108917f3aae63260278ffaf78f030e3fc651777 SHA1 42daf0895afd544e55ca1262a6509aa2ed538aad SHA256 9f39d7fc971a4fbff3041a6635b2b830bf057274862e21bcb1aea647d04ce821 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +AUX 9999-gentoo.patch 1506 RMD160 2aed9afcb45a82f83ff93ab8b4862103ce601192 SHA1 fae2b2309c277e777d4064d4cd7a4084ae1c8f4c SHA256 a9fbdf7551a9122f9b333c64ebb1a9290f877988861abb6743b7710e4ea18eee +EBUILD i7z-9999.ebuild 885 RMD160 ff2ff31d1ab32cd55030d426daf94fb611409a39 SHA1 b85f9602f6298c22b32bb4aa3a1b89dc2511f00a SHA256 5f2aedef59028b175ab68efdaef30a1dde74c36a410a741f28162e57549586dd +MISC ChangeLog 815 RMD160 d41edd47bfb6cabedfa9a0838738b8618ee4836d SHA1 053ab95dc2d06851a679958b8dfd942c22a4d79d SHA256 2b9f5140bffe0848711417e94a82c73a1394304fa3f3802ee269b93c13108da4 MISC metadata.xml 214 RMD160 efd8175069efb91061298ff4584218b633e44678 SHA1 d372fdbfcb7fd07a4082961d3f3527be4fca1d60 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEAREKAAYFAk77micACgkQgAnW8HDreRYawQCdHCCMdg5fQSzpIYWd4IJVyCDg +UncAn2LHSnPEt8Q+zKHdl48RvmcnZJn9 +=fCJa +-----END PGP SIGNATURE----- diff --git a/app-benchmarks/i7z/files/9999-gentoo.patch b/app-benchmarks/i7z/files/9999-gentoo.patch index e096ce2..f50f7c9 100644 --- a/app-benchmarks/i7z/files/9999-gentoo.patch +++ b/app-benchmarks/i7z/files/9999-gentoo.patch @@ -1,13 +1,16 @@ + Makefile | 21 ++++++++++----------- + 1 files changed, 10 insertions(+), 11 deletions(-) + diff --git a/Makefile b/Makefile -index fc4d262..e2347bf 100644 +index df50bde..a8da026 100644 --- a/Makefile +++ b/Makefile @@ -17,18 +17,18 @@ #makefile updated from patch by anestling --CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall -+CFLAGS += -O0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall +-CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN ++CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN LBITS := $(shell getconf LONG_BIT) ifeq ($(LBITS),64) @@ -19,7 +22,7 @@ index fc4d262..e2347bf 100644 endif -CC = gcc -+CC ?= gcc ++CC ?= gcc -LDFLAGS = -lncurses -lpthread -lrt +LIBS = -lncurses -lpthread -lrt @@ -33,24 +36,24 @@ index fc4d262..e2347bf 100644 -sbindir = /usr/sbin +sbindir = $(DESTDIR)/usr/sbin --all: clean message bin -+all: clean bin +-all: clean message bin test_exist ++all: bin message: @echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)" - bin: + bin: - $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) -o $(BIN) + $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS) - clean: - rm -f *.o $(BIN) -@@ -52,6 +52,6 @@ clean: + test_exist: + @test -f i7z && echo 'Succeeded, now run sudo ./i7z' || echo 'Compilation failed' +@@ -55,6 +55,5 @@ clean: distclean: clean rm -f *~ \#* -install: all - install -m 755 $(BIN) $(sbindir) +- +install: + install -D -m 755 $(BIN) $(sbindir)/$(BIN) - diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild index 1819372..40bf095 100644 --- a/app-benchmarks/i7z/i7z-9999.ebuild +++ b/app-benchmarks/i7z/i7z-9999.ebuild @@ -4,7 +4,7 @@ EAPI=4 -inherit eutils qt4-r2 subversion toolchain-funcs +inherit eutils flag-o-matic qt4-r2 subversion toolchain-funcs DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux" HOMEPAGE="http://code.google.com/p/i7z/" @@ -22,6 +22,7 @@ RDEPEND=" DEPEND="${RDEPEND}" src_prepare() { + replace-flags -O? -O0 epatch "${FILESDIR}"/${PV}-gentoo.patch tc-export CC } @@ -30,12 +31,12 @@ src_compile() { default if use X; then cd GUI - eqmake4 GUI.pro && emake + eqmake4 ${PN}_GUI.pro && emake clean && emake fi } src_install() { default - use X && newsbin GUI/GUI i7z_GUI + use X && dosbin GUI/i7z_GUI dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr } |