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