1 |
commit: bdfcda42bfda5fee4ae1826b449f87f05f32dadb |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 28 16:43:45 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 28 16:44:16 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdfcda42 |
7 |
|
8 |
Revert "dev-libs/simdjson: Remove old" |
9 |
|
10 |
This reverts commit 4a598d308f34e6fb8bf88c9f27574b4133115860. |
11 |
|
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
.../files/simdjson-0.4.7-tests-compiler.patch | 41 ++++++++++++++++++++++ |
15 |
dev-libs/simdjson/simdjson-0.4.7.ebuild | 34 ++++++++++++++++++ |
16 |
2 files changed, 75 insertions(+) |
17 |
|
18 |
diff --git a/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch b/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..b641373e1a3 |
21 |
--- /dev/null |
22 |
+++ b/dev-libs/simdjson/files/simdjson-0.4.7-tests-compiler.patch |
23 |
@@ -0,0 +1,41 @@ |
24 |
+diff --git a/examples/quickstart/Makefile b/examples/quickstart/Makefile |
25 |
+index 4d3f227..90c2237 100644 |
26 |
+--- a/examples/quickstart/Makefile |
27 |
++++ b/examples/quickstart/Makefile |
28 |
+@@ -5,7 +5,7 @@ JSONEXAMPLES=$(ROOT)/jsonexamples |
29 |
+ test: quickstart twitter.json |
30 |
+ ./quickstart |
31 |
+ quickstart: quickstart.cpp simdjson.cpp simdjson.h |
32 |
+- c++ -o ./quickstart quickstart.cpp simdjson.cpp |
33 |
++ $(CXX) -o ./quickstart quickstart.cpp simdjson.cpp |
34 |
+ clean: |
35 |
+ rm -f simdjson.cpp simdjson.h twitter.json quickstart quickstart11 quickstart14 |
36 |
+ simdjson.cpp: $(SINGLEHEADER)/simdjson.cpp |
37 |
+@@ -17,16 +17,16 @@ twitter.json: $(JSONEXAMPLES)/twitter.json |
38 |
+ |
39 |
+ quickstart11: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp |
40 |
+ rm -f simdjson.h simdjson.cpp |
41 |
+- c++ -o ./quickstart11 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++11 |
42 |
++ $(CXX) -o ./quickstart11 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++11 |
43 |
+ test11: quickstart11 twitter.json |
44 |
+ ./quickstart11 |
45 |
+ quickstart14: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp |
46 |
+ rm -f simdjson.h simdjson.cpp |
47 |
+- c++ -o ./quickstart14 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++14 |
48 |
++ $(CXX) -o ./quickstart14 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++14 |
49 |
+ test14: quickstart14 twitter.json |
50 |
+ ./quickstart14 |
51 |
+ quickstart17: $(ROOT)/src/**.h $(ROOT)/src/**.cpp $(ROOT)/include/**.h $(ROOT)/src/**.cpp |
52 |
+ rm -f simdjson.h simdjson.cpp |
53 |
+- c++ -o ./quickstart17 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++17 |
54 |
++ $(CXX) -o ./quickstart17 quickstart.cpp $(ROOT)/src/simdjson.cpp -I$(ROOT)/src -I$(ROOT)/include -std=c++17 |
55 |
+ test17: quickstart17 twitter.json |
56 |
+ ./quickstart17 |
57 |
+diff --git a/singleheader/README.md b/singleheader/README.md |
58 |
+index fd58a7a..e495ec9 100644 |
59 |
+--- a/singleheader/README.md |
60 |
++++ b/singleheader/README.md |
61 |
+@@ -1,2 +1,2 @@ |
62 |
+ Try : |
63 |
+-c++ -O3 -std=c++17 -pthread -o amalgamate_demo amalgamate_demo.cpp && ./amalgamate_demo ../jsonexamples/twitter.json ../jsonexamples/amazon_cellphones.ndjson |
64 |
++${CXX} -O3 -std=c++17 -pthread -o amalgamate_demo amalgamate_demo.cpp && ./amalgamate_demo ../jsonexamples/twitter.json ../jsonexamples/amazon_cellphones.ndjson |
65 |
|
66 |
diff --git a/dev-libs/simdjson/simdjson-0.4.7.ebuild b/dev-libs/simdjson/simdjson-0.4.7.ebuild |
67 |
new file mode 100644 |
68 |
index 00000000000..77da37bac07 |
69 |
--- /dev/null |
70 |
+++ b/dev-libs/simdjson/simdjson-0.4.7.ebuild |
71 |
@@ -0,0 +1,34 @@ |
72 |
+# Copyright 2020 Gentoo Authors |
73 |
+# Distributed under the terms of the GNU General Public License v2 |
74 |
+ |
75 |
+EAPI=7 |
76 |
+ |
77 |
+inherit toolchain-funcs cmake |
78 |
+ |
79 |
+DESCRIPTION="SIMD accelerated C++ JSON library" |
80 |
+HOMEPAGE=" |
81 |
+ https://simdjson.org/ |
82 |
+ https://github.com/simdjson/simdjson |
83 |
+" |
84 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
85 |
+ |
86 |
+LICENSE="Apache-2.0 Boost-1.0" |
87 |
+SLOT="0/2" |
88 |
+KEYWORDS="~amd64 ~x86" |
89 |
+IUSE="test" |
90 |
+ |
91 |
+BDEPEND=" |
92 |
+ sys-apps/file |
93 |
+ sys-apps/findutils |
94 |
+ sys-apps/grep |
95 |
+" |
96 |
+ |
97 |
+RESTRICT="!test? ( test )" |
98 |
+ |
99 |
+src_configure() { |
100 |
+ local mycmakeargs=( |
101 |
+ $(usex test '' '-DSIMDJSON_JUST_LIBRARY=ON') |
102 |
+ ) |
103 |
+ |
104 |
+ cmake_src_configure |
105 |
+} |