1 |
jlec 11/12/28 22:32:00 |
2 |
|
3 |
Added: i7z-0.27.1-gentoo.patch |
4 |
Log: |
5 |
Version Bump |
6 |
|
7 |
(Portage version: 2.2.0_alpha83/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-benchmarks/i7z/files/i7z-0.27.1-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/i7z/files/i7z-0.27.1-gentoo.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/i7z/files/i7z-0.27.1-gentoo.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: i7z-0.27.1-gentoo.patch |
16 |
=================================================================== |
17 |
Makefile | 21 ++++++++++----------- |
18 |
1 files changed, 10 insertions(+), 11 deletions(-) |
19 |
|
20 |
diff --git a/Makefile b/Makefile |
21 |
index df50bde..a8da026 100644 |
22 |
--- a/Makefile |
23 |
+++ b/Makefile |
24 |
@@ -17,18 +17,18 @@ |
25 |
|
26 |
#makefile updated from patch by anestling |
27 |
|
28 |
-CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN |
29 |
+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN |
30 |
|
31 |
LBITS := $(shell getconf LONG_BIT) |
32 |
ifeq ($(LBITS),64) |
33 |
- CFLAGS = $(CFLAGSANY) -Dx64_BIT |
34 |
+ CFLAGS += -Dx64_BIT |
35 |
else |
36 |
- CFLAGS = $(CFLAGSANY) -Dx86 |
37 |
+ CFLAGS += -Dx86 |
38 |
endif |
39 |
|
40 |
-CC = gcc |
41 |
+CC ?= gcc |
42 |
|
43 |
-LDFLAGS = -lncurses -lpthread -lrt |
44 |
+LIBS = -lncurses -lpthread -lrt |
45 |
INCLUDEFLAGS = |
46 |
|
47 |
OBJS = helper_functions |
48 |
@@ -36,15 +36,15 @@ OBJS = helper_functions |
49 |
BIN = i7z |
50 |
SRC = i7z.c helper_functions.c i7z_Single_Socket.c i7z_Dual_Socket.c |
51 |
|
52 |
-sbindir = /usr/sbin |
53 |
+sbindir = $(DESTDIR)/usr/sbin |
54 |
|
55 |
-all: clean message bin test_exist |
56 |
+all: bin |
57 |
|
58 |
message: |
59 |
@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)" |
60 |
|
61 |
bin: |
62 |
- $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) -o $(BIN) |
63 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS) |
64 |
|
65 |
test_exist: |
66 |
@test -f i7z && echo 'Succeeded, now run sudo ./i7z' || echo 'Compilation failed' |
67 |
@@ -55,6 +55,5 @@ clean: |
68 |
distclean: clean |
69 |
rm -f *~ \#* |
70 |
|
71 |
-install: all |
72 |
- install -m 755 $(BIN) $(sbindir) |
73 |
- |
74 |
+install: |
75 |
+ install -D -m 755 $(BIN) $(sbindir)/$(BIN) |