| 1 |
commit: 5f3036bbe4df6f0ea7601bd3ff9a39b49131f7aa |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 31 12:39:19 2011 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 31 12:39:19 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=5f3036bb |
| 7 |
|
| 8 |
app-benchmarks/i7z: Adopt to HEAD and include patch from http://code.google.com/p/i7z/issues/detail?id=44 |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha84/git/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 11 |
|
| 12 |
--- |
| 13 |
app-benchmarks/i7z/ChangeLog | 5 +++ |
| 14 |
app-benchmarks/i7z/files/9999-gentoo.patch | 51 ++++++++++++++++------------ |
| 15 |
app-benchmarks/i7z/i7z-9999.ebuild | 2 - |
| 16 |
3 files changed, 34 insertions(+), 24 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog |
| 19 |
index 119c19e..d940882 100644 |
| 20 |
--- a/app-benchmarks/i7z/ChangeLog |
| 21 |
+++ b/app-benchmarks/i7z/ChangeLog |
| 22 |
@@ -2,6 +2,11 @@ |
| 23 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 31 Dec 2011; Justin Lecher <jlec@g.o> files/9999-gentoo.patch, |
| 27 |
+ i7z-9999.ebuild: |
| 28 |
+ Adopt to HEAD and include patch from |
| 29 |
+ http://code.google.com/p/i7z/issues/detail?id=44 |
| 30 |
+ |
| 31 |
28 Dec 2011; Justin Lecher <jlec@g.o> files/9999-gentoo.patch, |
| 32 |
i7z-9999.ebuild: |
| 33 |
Fix for current HEAD |
| 34 |
|
| 35 |
diff --git a/app-benchmarks/i7z/files/9999-gentoo.patch b/app-benchmarks/i7z/files/9999-gentoo.patch |
| 36 |
index f50f7c9..63bbacf 100644 |
| 37 |
--- a/app-benchmarks/i7z/files/9999-gentoo.patch |
| 38 |
+++ b/app-benchmarks/i7z/files/9999-gentoo.patch |
| 39 |
@@ -1,16 +1,14 @@ |
| 40 |
- Makefile | 21 ++++++++++----------- |
| 41 |
- 1 files changed, 10 insertions(+), 11 deletions(-) |
| 42 |
- |
| 43 |
-diff --git a/Makefile b/Makefile |
| 44 |
-index df50bde..a8da026 100644 |
| 45 |
---- a/Makefile |
| 46 |
-+++ b/Makefile |
| 47 |
-@@ -17,18 +17,18 @@ |
| 48 |
+Index: Makefile |
| 49 |
+=================================================================== |
| 50 |
+--- Makefile (revision 81) |
| 51 |
++++ Makefile (working copy) |
| 52 |
+@@ -19,36 +19,40 @@ |
| 53 |
|
| 54 |
- #makefile updated from patch by anestling |
| 55 |
- |
| 56 |
--CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN |
| 57 |
-+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN |
| 58 |
+ #explicitly disable two scheduling flags as they cause segfaults |
| 59 |
+ CFLAGS_FOR_AVOIDING_SEG_FAULT = -fno-schedule-insns2 -fno-schedule-insns |
| 60 |
+-CFLAGSANY = $(CFLAGS_FOR_AVOIDING_SEG_FAULT) -O0 -g -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN |
| 61 |
++CFLAGS ?= -O0 -g |
| 62 |
++CFLAGS += $(CFLAGS_FOR_AVOIDING_SEG_FAULT) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN |
| 63 |
|
| 64 |
LBITS := $(shell getconf LONG_BIT) |
| 65 |
ifeq ($(LBITS),64) |
| 66 |
@@ -25,35 +23,44 @@ index df50bde..a8da026 100644 |
| 67 |
+CC ?= gcc |
| 68 |
|
| 69 |
-LDFLAGS = -lncurses -lpthread -lrt |
| 70 |
-+LIBS = -lncurses -lpthread -lrt |
| 71 |
++LIBS += -lncurses -lpthread -lrt |
| 72 |
INCLUDEFLAGS = |
| 73 |
|
| 74 |
OBJS = helper_functions |
| 75 |
-@@ -36,15 +36,15 @@ OBJS = helper_functions |
| 76 |
+ |
| 77 |
BIN = i7z |
| 78 |
SRC = i7z.c helper_functions.c i7z_Single_Socket.c i7z_Dual_Socket.c |
| 79 |
++OBJ = $(SRC:.c=.o) |
| 80 |
|
| 81 |
-sbindir = /usr/sbin |
| 82 |
-+sbindir = $(DESTDIR)/usr/sbin |
| 83 |
++prefix = /usr |
| 84 |
++sbindir = $(prefix)/sbin |
| 85 |
++docdir = $(prefix)/share/doc/$(BIN) |
| 86 |
|
| 87 |
-all: clean message bin test_exist |
| 88 |
-+all: bin |
| 89 |
++all: test_exist |
| 90 |
|
| 91 |
message: |
| 92 |
@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)" |
| 93 |
|
| 94 |
- bin: |
| 95 |
+-bin: |
| 96 |
- $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) -o $(BIN) |
| 97 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS) |
| 98 |
++bin: message $(OBJ) |
| 99 |
++ $(CC) $(LDFLAGS) -o $(BIN) $(OBJ) $(LIBS) |
| 100 |
|
| 101 |
- test_exist: |
| 102 |
+-test_exist: |
| 103 |
++test_exist: bin |
| 104 |
@test -f i7z && echo 'Succeeded, now run sudo ./i7z' || echo 'Compilation failed' |
| 105 |
-@@ -55,6 +55,5 @@ clean: |
| 106 |
+ |
| 107 |
+ clean: |
| 108 |
+@@ -57,6 +61,7 @@ |
| 109 |
distclean: clean |
| 110 |
rm -f *~ \#* |
| 111 |
|
| 112 |
-install: all |
| 113 |
- install -m 755 $(BIN) $(sbindir) |
| 114 |
- |
| 115 |
-+install: |
| 116 |
-+ install -D -m 755 $(BIN) $(sbindir)/$(BIN) |
| 117 |
++install: $(BIN) |
| 118 |
++ install -d $(DESTDIR)$(sbindir) $(DESTDIR)$(docdir) |
| 119 |
++ install -m 755 $(BIN) $(DESTDIR)$(sbindir) |
| 120 |
++ install -m 0644 README.txt put_cores_offline.sh put_cores_online.sh MAKEDEV-cpuid-msr $(DESTDIR)$(docdir) |
| 121 |
|
| 122 |
diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild |
| 123 |
index 40bf095..4b9a2e2 100644 |
| 124 |
--- a/app-benchmarks/i7z/i7z-9999.ebuild |
| 125 |
+++ b/app-benchmarks/i7z/i7z-9999.ebuild |
| 126 |
@@ -22,7 +22,6 @@ RDEPEND=" |
| 127 |
DEPEND="${RDEPEND}" |
| 128 |
|
| 129 |
src_prepare() { |
| 130 |
- replace-flags -O? -O0 |
| 131 |
epatch "${FILESDIR}"/${PV}-gentoo.patch |
| 132 |
tc-export CC |
| 133 |
} |
| 134 |
@@ -38,5 +37,4 @@ src_compile() { |
| 135 |
src_install() { |
| 136 |
default |
| 137 |
use X && dosbin GUI/i7z_GUI |
| 138 |
- dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr |
| 139 |
} |
Archives