1 |
commit: bad88660641ac8a5937dc4212e3e6fd2fc285a7f |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 28 22:37:27 2011 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 28 22:37:27 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=bad88660 |
7 |
|
8 |
Fix for current HEAD |
9 |
|
10 |
(Portage version: 2.2.0_alpha83/git/Linux x86_64, signed Manifest commit with key 70EB7916) |
11 |
|
12 |
--- |
13 |
app-benchmarks/i7z/ChangeLog | 4 ++++ |
14 |
app-benchmarks/i7z/files/9999-gentoo.patch | 25 ++++++++++++++----------- |
15 |
app-benchmarks/i7z/i7z-9999.ebuild | 7 ++++--- |
16 |
3 files changed, 22 insertions(+), 14 deletions(-) |
17 |
|
18 |
diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog |
19 |
index a1a8101..119c19e 100644 |
20 |
--- a/app-benchmarks/i7z/ChangeLog |
21 |
+++ b/app-benchmarks/i7z/ChangeLog |
22 |
@@ -2,6 +2,10 @@ |
23 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: $ |
25 |
|
26 |
+ 28 Dec 2011; Justin Lecher <jlec@g.o> files/9999-gentoo.patch, |
27 |
+ i7z-9999.ebuild: |
28 |
+ Fix for current HEAD |
29 |
+ |
30 |
04 Dec 2011; Justin Lecher <jlec@g.o> files/9999-gentoo.patch: |
31 |
Adopted to changes in HEAD |
32 |
|
33 |
|
34 |
diff --git a/app-benchmarks/i7z/files/9999-gentoo.patch b/app-benchmarks/i7z/files/9999-gentoo.patch |
35 |
index e096ce2..f50f7c9 100644 |
36 |
--- a/app-benchmarks/i7z/files/9999-gentoo.patch |
37 |
+++ b/app-benchmarks/i7z/files/9999-gentoo.patch |
38 |
@@ -1,13 +1,16 @@ |
39 |
+ Makefile | 21 ++++++++++----------- |
40 |
+ 1 files changed, 10 insertions(+), 11 deletions(-) |
41 |
+ |
42 |
diff --git a/Makefile b/Makefile |
43 |
-index fc4d262..e2347bf 100644 |
44 |
+index df50bde..a8da026 100644 |
45 |
--- a/Makefile |
46 |
+++ b/Makefile |
47 |
@@ -17,18 +17,18 @@ |
48 |
|
49 |
#makefile updated from patch by anestling |
50 |
|
51 |
--CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall |
52 |
-+CFLAGS += -O0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall |
53 |
+-CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN |
54 |
++CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN |
55 |
|
56 |
LBITS := $(shell getconf LONG_BIT) |
57 |
ifeq ($(LBITS),64) |
58 |
@@ -19,7 +22,7 @@ index fc4d262..e2347bf 100644 |
59 |
endif |
60 |
|
61 |
-CC = gcc |
62 |
-+CC ?= gcc |
63 |
++CC ?= gcc |
64 |
|
65 |
-LDFLAGS = -lncurses -lpthread -lrt |
66 |
+LIBS = -lncurses -lpthread -lrt |
67 |
@@ -33,24 +36,24 @@ index fc4d262..e2347bf 100644 |
68 |
-sbindir = /usr/sbin |
69 |
+sbindir = $(DESTDIR)/usr/sbin |
70 |
|
71 |
--all: clean message bin |
72 |
-+all: clean bin |
73 |
+-all: clean message bin test_exist |
74 |
++all: bin |
75 |
|
76 |
message: |
77 |
@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)" |
78 |
|
79 |
- bin: |
80 |
+ bin: |
81 |
- $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) -o $(BIN) |
82 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS) |
83 |
|
84 |
- clean: |
85 |
- rm -f *.o $(BIN) |
86 |
-@@ -52,6 +52,6 @@ clean: |
87 |
+ test_exist: |
88 |
+ @test -f i7z && echo 'Succeeded, now run sudo ./i7z' || echo 'Compilation failed' |
89 |
+@@ -55,6 +55,5 @@ clean: |
90 |
distclean: clean |
91 |
rm -f *~ \#* |
92 |
|
93 |
-install: all |
94 |
- install -m 755 $(BIN) $(sbindir) |
95 |
+- |
96 |
+install: |
97 |
+ install -D -m 755 $(BIN) $(sbindir)/$(BIN) |
98 |
- |
99 |
|
100 |
diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild |
101 |
index 1819372..40bf095 100644 |
102 |
--- a/app-benchmarks/i7z/i7z-9999.ebuild |
103 |
+++ b/app-benchmarks/i7z/i7z-9999.ebuild |
104 |
@@ -4,7 +4,7 @@ |
105 |
|
106 |
EAPI=4 |
107 |
|
108 |
-inherit eutils qt4-r2 subversion toolchain-funcs |
109 |
+inherit eutils flag-o-matic qt4-r2 subversion toolchain-funcs |
110 |
|
111 |
DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux" |
112 |
HOMEPAGE="http://code.google.com/p/i7z/" |
113 |
@@ -22,6 +22,7 @@ RDEPEND=" |
114 |
DEPEND="${RDEPEND}" |
115 |
|
116 |
src_prepare() { |
117 |
+ replace-flags -O? -O0 |
118 |
epatch "${FILESDIR}"/${PV}-gentoo.patch |
119 |
tc-export CC |
120 |
} |
121 |
@@ -30,12 +31,12 @@ src_compile() { |
122 |
default |
123 |
if use X; then |
124 |
cd GUI |
125 |
- eqmake4 GUI.pro && emake |
126 |
+ eqmake4 ${PN}_GUI.pro && emake clean && emake |
127 |
fi |
128 |
} |
129 |
|
130 |
src_install() { |
131 |
default |
132 |
- use X && newsbin GUI/GUI i7z_GUI |
133 |
+ use X && dosbin GUI/i7z_GUI |
134 |
dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr |
135 |
} |