1 |
commit: 173c62837c28971e2c0c3bbc038ec16fe4930b38 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 9 09:39:58 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 9 09:44:34 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=173c6283 |
7 |
|
8 |
dev-libs/xxhash: Compile xxhash.c just once, really |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
.../files/xxhash-0.6.5-compile-xxhash.o-once.patch | 28 ++++++++++++++++++++++ |
13 |
...xhash-0.6.5-do-not-compile-xxhash.o-twice.patch | 11 --------- |
14 |
dev-libs/xxhash/xxhash-0.6.5.ebuild | 2 +- |
15 |
3 files changed, 29 insertions(+), 12 deletions(-) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 00000000000..2eb7f8c22a8 |
20 |
--- /dev/null |
21 |
+++ b/dev-libs/xxhash/files/xxhash-0.6.5-compile-xxhash.o-once.patch |
22 |
@@ -0,0 +1,28 @@ |
23 |
+--- a/Makefile |
24 |
++++ b/Makefile |
25 |
+@@ -82,7 +82,7 @@ |
26 |
+ all: lib xxhsum xxhsum_inlinedXXH |
27 |
+ |
28 |
+ xxhsum32: CFLAGS += -m32 |
29 |
+-xxhsum xxhsum32: xxhash.c xxhsum.c |
30 |
++xxhsum xxhsum32: xxhash.o xxhsum.c |
31 |
+ $(CC) $(FLAGS) $^ -o $@$(EXT) |
32 |
+ |
33 |
+ .PHONY: xxhsum_and_links |
34 |
+@@ -105,12 +105,12 @@ |
35 |
+ ifeq (,$(filter Windows%,$(OS))) |
36 |
+ $(LIBXXH): LDFLAGS += -fPIC |
37 |
+ endif |
38 |
+-$(LIBXXH): xxhash.c |
39 |
++$(LIBXXH): xxhash.o |
40 |
+ @echo compiling dynamic library $(LIBVER) |
41 |
+- @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ |
42 |
++ $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ |
43 |
+ @echo creating versioned links |
44 |
+- @ln -sf $@ libxxhash.$(SHARED_EXT_MAJOR) |
45 |
+- @ln -sf $@ libxxhash.$(SHARED_EXT) |
46 |
++ ln -sf $@ libxxhash.$(SHARED_EXT_MAJOR) |
47 |
++ ln -sf $@ libxxhash.$(SHARED_EXT) |
48 |
+ |
49 |
+ libxxhash : $(LIBXXH) |
50 |
+ |
51 |
|
52 |
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 |
53 |
deleted file mode 100644 |
54 |
index dcbc8c32dec..00000000000 |
55 |
--- a/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch |
56 |
+++ /dev/null |
57 |
@@ -1,11 +0,0 @@ |
58 |
---- a/Makefile |
59 |
-+++ b/Makefile |
60 |
-@@ -82,7 +82,7 @@ |
61 |
- all: lib xxhsum xxhsum_inlinedXXH |
62 |
- |
63 |
- xxhsum32: CFLAGS += -m32 |
64 |
--xxhsum xxhsum32: xxhash.c xxhsum.c |
65 |
-+xxhsum xxhsum32: xxhash.o xxhsum.c |
66 |
- $(CC) $(FLAGS) $^ -o $@$(EXT) |
67 |
- |
68 |
- .PHONY: xxhsum_and_links |
69 |
|
70 |
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild |
71 |
index f8633569a91..503fce79380 100644 |
72 |
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild |
73 |
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild |
74 |
@@ -17,7 +17,7 @@ DEPEND="" |
75 |
|
76 |
S="${WORKDIR}/xxHash-${PV}" |
77 |
PATCHES=( |
78 |
- "${FILESDIR}"/${PN}-0.6.5-do-not-compile-xxhash.o-twice.patch |
79 |
+ "${FILESDIR}"/${PN}-0.6.5-compile-xxhash.o-once.patch |
80 |
) |
81 |
|
82 |
src_configure() { |