commit: 9e004b8041e0ad0dac24797b8b7c0d26d0271cab
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 09:40:25 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 09:40:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e004b80
Revert "dev-libs/xxhash: Compile xxhash.c just once, really"
This reverts commit 173c62837c28971e2c0c3bbc038ec16fe4930b38.
.../files/xxhash-0.6.5-compile-xxhash.o-once.patch | 28 ----------------------
...xhash-0.6.5-do-not-compile-xxhash.o-twice.patch | 11 +++++++++
dev-libs/xxhash/xxhash-0.6.5.ebuild | 2 +-
3 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/dev-libs/xxhash/files/xxhash-0.6.5-compile-xxhash.o-once.patch
b/dev-libs/xxhash/files/xxhash-0.6.5-compile-xxhash.o-once.patch
deleted file mode 100644
index 2eb7f8c22a8..00000000000
--- a/dev-libs/xxhash/files/xxhash-0.6.5-compile-xxhash.o-once.patch
+++ /dev/null
@@ -1,28 +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
-@@ -105,12 +105,12 @@
- ifeq (,$(filter Windows%,$(OS)))
- $(LIBXXH): LDFLAGS += -fPIC
- endif
--$(LIBXXH): xxhash.c
-+$(LIBXXH): xxhash.o
- @echo compiling dynamic library $(LIBVER)
-- @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
-+ $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
- @echo creating versioned links
-- @ln -sf $@ libxxhash.$(SHARED_EXT_MAJOR)
-- @ln -sf $@ libxxhash.$(SHARED_EXT)
-+ ln -sf $@ libxxhash.$(SHARED_EXT_MAJOR)
-+ ln -sf $@ libxxhash.$(SHARED_EXT)
-
- libxxhash : $(LIBXXH)
-
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
new file mode 100644
index 00000000000..dcbc8c32dec
--- /dev/null
+++ b/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch
@@ -0,0 +1,11 @@
+--- 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 f01881f5cb1..18a037770e5 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -15,7 +15,7 @@ IUSE="static-libs"
S="${WORKDIR}/xxHash-${PV}"
PATCHES=(
- "${FILESDIR}"/${PN}-0.6.5-compile-xxhash.o-once.patch
+ "${FILESDIR}"/${PN}-0.6.5-do-not-compile-xxhash.o-twice.patch
)
src_compile() {
