diff options
| author |   Marc Schiffbauer <mschiff@gentoo.org> | 2011-12-05 02:50:55 +0100 |
|---|---|---|
| committer | Marc Schiffbauer <mschiff@gentoo.org> | 2011-12-05 02:50:55 +0100 |
| commit | 898a9948c2fff9baf541fcaf1a7269547ed5f658 (patch) | |
| tree | 3b9dfabb8cb7de6539973e81251b3afa3bfc19d1 | |
| parent | fix wualacmd (diff) | |
| download | mschiff-898a9948c2fff9baf541fcaf1a7269547ed5f658.tar.gz mschiff-898a9948c2fff9baf541fcaf1a7269547ed5f658.tar.bz2 mschiff-898a9948c2fff9baf541fcaf1a7269547ed5f658.zip | |
fix Makefile patch
| -rw-r--r-- | app-benchmarks/i7z/Manifest | 16 | ||||
| -rw-r--r-- | app-benchmarks/i7z/files/svn-78-gentoo.patch | 54 | ||||
| -rw-r--r-- | app-benchmarks/i7z/i7z-9999.ebuild | 2 | ||||
| -rw-r--r-- | app-benchmarks/i7z/metadata.xml | 1 |
4 files changed, 59 insertions, 14 deletions
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest index 5bf7934..ff40fd1 100644 --- a/app-benchmarks/i7z/Manifest +++ b/app-benchmarks/i7z/Manifest @@ -1,13 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0.26-gentoo.patch 1341 RMD160 a4f8d6bb7b264133ba44f7f7a29aef6659d5a839 SHA1 16ef35271a623b16c601e12d22e1a39fcee4b329 SHA256 ea831b1aca9772c7de12e9bc6a8d7f31fa93f4fa2cb0f721a76f9004c524d884 -EBUILD i7z-9999.ebuild 915 RMD160 68aba40dd81705a8a97bf05623febf764e563db7 SHA1 c7380d1d73aa4e4b8d26f884dfc3dd185dc2a317 SHA256 797fbae261ecf284e8bc0523150488f956bca70bc16811b80f3ba8c6d3b7c3ab -MISC metadata.xml 258 RMD160 36c7408d99ec9e4744eb812056807c973ad43654 SHA1 c9a8e30a62ee8979c9e3f9d9a04f45ddc9b95e98 SHA256 fa93955247f65072d146bc94ad4e380ca13d4388646c47dc9850580f550b5b47 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iD8DBQFOA0clKWxsyjWmQTQRAkvcAJ9BKap+sO4rFlaPCo2VKN94b5eF9gCgseT/ -IOdwKE5iHhjB1+7OPCKLyWI= -=x0OA ------END PGP SIGNATURE----- +AUX svn-43-gentoo.patch 1450 RMD160 d8ad9e1dba083fb77e5c72eff98032f79397af43 SHA1 bf3861bbcffd80d59499b231d99bc351d6854fa9 SHA256 787e276dfe3e26e97799fae3a1225b2beceff5f100e7b9ba4518c42d0da73f28 +AUX svn-78-gentoo.patch 1381 RMD160 32de2edf7ba4f399698e853341d193c42e509fd7 SHA1 fd288c33e9da22e6b21b10d81fd0182a77196b4c SHA256 8b557836830f4441d3828a77445e028c646e9d81a77995e2cd986e2bef2b4368 +EBUILD i7z-9999.ebuild 917 RMD160 cc547c615a06bff615ecab6048be4931c0415fe9 SHA1 db79fb341558b77ec3770f729c0126b3d1341d87 SHA256 265b02b310213b6ef0151e670e1d8ce29917500060e9dec3372fd00985d3a5bb +MISC metadata.xml 236 RMD160 5c57b0291e26469fb522c377d9b6373830889ebb SHA1 4da113512bdf7f06bde8a17a9332c28da0ecf1b6 SHA256 f55443c9b3d97fcc9437b9aeba1b3beae39e38599620bd520d0693bb8948b531 diff --git a/app-benchmarks/i7z/files/svn-78-gentoo.patch b/app-benchmarks/i7z/files/svn-78-gentoo.patch new file mode 100644 index 0000000..5db73dd --- /dev/null +++ b/app-benchmarks/i7z/files/svn-78-gentoo.patch @@ -0,0 +1,54 @@ +diff -ur i7z-9999.orig/Makefile i7z-9999/Makefile +--- i7z-9999.orig/Makefile 2011-12-05 02:33:44.719172855 +0100 ++++ i7z-9999/Makefile 2011-12-05 02:47:10.334079977 +0100 +@@ -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 + + LBITS := $(shell getconf LONG_BIT) + ifeq ($(LBITS),64) +- CFLAGS = $(CFLAGSANY) -Dx64_BIT ++ CFLAGS += -Dx64_BIT + else +- CFLAGS = $(CFLAGSANY) -Dx86 ++ CFLAGS += -Dx86 + endif + + CC = gcc + +-LDFLAGS = -lncurses -lpthread -lrt ++LIBS = -lncurses -lpthread -lrt + INCLUDEFLAGS = + + OBJS = helper_functions +@@ -36,15 +36,15 @@ + BIN = i7z + SRC = i7z.c helper_functions.c i7z_Single_Socket.c i7z_Dual_Socket.c + +-sbindir = /usr/sbin ++sbindir = $(DESTDIR)/usr/sbin + +-all: clean message bin ++all: clean bin + + message: + @echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)" + + 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 @@ + 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 2f50097..e8c0edb 100644 --- a/app-benchmarks/i7z/i7z-9999.ebuild +++ b/app-benchmarks/i7z/i7z-9999.ebuild @@ -28,7 +28,7 @@ RDEPEND=" DEPEND="${RDEPEND}" src_prepare() { - epatch "${FILESDIR}"/0.26-gentoo.patch + epatch "${FILESDIR}"/svn-78-gentoo.patch tc-export CC } diff --git a/app-benchmarks/i7z/metadata.xml b/app-benchmarks/i7z/metadata.xml index 385eecb..ea7bd02 100644 --- a/app-benchmarks/i7z/metadata.xml +++ b/app-benchmarks/i7z/metadata.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>no-herd</herd> <maintainer> <email>mschiff@gentoo.org</email> <name>Marc Schiffbauer</name> |