summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuilherme Amadio <amadio@gentoo.org>2018-09-17 11:40:34 +0200
committerGuilherme Amadio <amadio@gentoo.org>2018-09-17 11:40:34 +0200
commit2ced48fa349c2dc39e09dcd7ac6eac76510c8ae6 (patch)
tree3c06002a9b7885c1aa6b189cc57220a33e4a1082 /dev-libs/xxhash
parentRevert "dev-libs/xxhash: Compile xxhash.c just once, really" (diff)
downloadgentoo-2ced48fa349c2dc39e09dcd7ac6eac76510c8ae6.tar.gz
gentoo-2ced48fa349c2dc39e09dcd7ac6eac76510c8ae6.tar.bz2
gentoo-2ced48fa349c2dc39e09dcd7ac6eac76510c8ae6.zip
Revert "dev-libs/xxhash: Compile xxhash.o once"
This reverts commit 01e24f2cd0d3bea9dab9c6047648941d677dbcb6.
Diffstat (limited to 'dev-libs/xxhash')
-rw-r--r--dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch11
-rw-r--r--dev-libs/xxhash/xxhash-0.6.5.ebuild3
2 files changed, 0 insertions, 14 deletions
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
deleted file mode 100644
index dcbc8c32dec..00000000000
--- a/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -82,7 +82,7 @@
- all: lib xxhsum xxhsum_inlinedXXH
-
- xxhsum32: CFLAGS += -m32
--xxhsum xxhsum32: xxhash.c xxhsum.c
-+xxhsum xxhsum32: xxhash.o xxhsum.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
-
- .PHONY: xxhsum_and_links
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index 18a037770e5..fac71089f07 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -14,9 +14,6 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/xxHash-${PV}"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.6.5-do-not-compile-xxhash.o-twice.patch
-)
src_compile() {
PREFIX="${EPREFIX}/usr" \