Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xxhash/files/, dev-libs/xxhash/
Date: Mon, 17 Sep 2018 09:51:01
Message-Id: 1537177234.2ced48fa349c2dc39e09dcd7ac6eac76510c8ae6.amadio@gentoo
1 commit: 2ced48fa349c2dc39e09dcd7ac6eac76510c8ae6
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 17 09:40:34 2018 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 17 09:40:34 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ced48fa
7
8 Revert "dev-libs/xxhash: Compile xxhash.o once"
9
10 This reverts commit 01e24f2cd0d3bea9dab9c6047648941d677dbcb6.
11
12 .../files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch | 11 -----------
13 dev-libs/xxhash/xxhash-0.6.5.ebuild | 3 ---
14 2 files changed, 14 deletions(-)
15
16 diff --git a/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch b/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch
17 deleted file mode 100644
18 index dcbc8c32dec..00000000000
19 --- a/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch
20 +++ /dev/null
21 @@ -1,11 +0,0 @@
22 ---- a/Makefile
23 -+++ b/Makefile
24 -@@ -82,7 +82,7 @@
25 - all: lib xxhsum xxhsum_inlinedXXH
26 -
27 - xxhsum32: CFLAGS += -m32
28 --xxhsum xxhsum32: xxhash.c xxhsum.c
29 -+xxhsum xxhsum32: xxhash.o xxhsum.c
30 - $(CC) $(FLAGS) $^ -o $@$(EXT)
31 -
32 - .PHONY: xxhsum_and_links
33
34 diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
35 index 18a037770e5..fac71089f07 100644
36 --- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
37 +++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
38 @@ -14,9 +14,6 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x64-macos"
39 IUSE="static-libs"
40
41 S="${WORKDIR}/xxHash-${PV}"
42 -PATCHES=(
43 - "${FILESDIR}"/${PN}-0.6.5-do-not-compile-xxhash.o-twice.patch
44 -)
45
46 src_compile() {
47 PREFIX="${EPREFIX}/usr" \