public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/, dev-libs/simdjson/files/
@ 2020-12-05 21:39 Patrick McLean
  0 siblings, 0 replies; 6+ messages in thread
From: Patrick McLean @ 2020-12-05 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     27e2fddc3ce1961b6ec619a12b475c200a7738cb
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  5 21:38:57 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sat Dec  5 21:39:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e2fddc

dev-libs/simdjson-0.7.0-r1: Revbump, fix tests (bug #758623)

Also add "tools" USE flag to install extra tools.

Closes: https://bugs.gentoo.org/758623
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../files/simdjson-0.7.0-dont-bundle-cssopts.patch | 29 ++++++++++++++++++++++
 dev-libs/simdjson/metadata.xml                     |  3 +++
 ...djson-0.7.0.ebuild => simdjson-0.7.0-r1.ebuild} | 14 +++++++++--
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch b/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch
new file mode 100644
index 00000000000..1f82151fb3d
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch
@@ -0,0 +1,29 @@
+diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
+index 51ab3a31..d3d5e86e 100644
+--- a/dependencies/CMakeLists.txt
++++ b/dependencies/CMakeLists.txt
+@@ -105,6 +105,3 @@ endif()
+ set_off(CXXOPTS_BUILD_EXAMPLES)
+ set_off(CXXOPTS_BUILD_TESTS)
+ set_off(CXXOPTS_ENABLE_INSTALL)
+-
+-import_dependency(cxxopts jarro2783/cxxopts 794c975)
+-add_dependency(cxxopts)
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index f1a82be7..217a9fee 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -1,10 +1,7 @@
+-if(TARGET cxxopts) # we only build the tools if cxxopts is available
+   message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).")
+-  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts)
++  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
+   add_executable(json2json json2json.cpp)
+   add_executable(jsonstats jsonstats.cpp)
+   add_executable(jsonpointer jsonpointer.cpp)
+   add_executable(minify minify.cpp)
+-else()
+-  message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
+-endif()
+\ No newline at end of file
++  install(TARGETS json2json jsonstats jsonpointer minify DESTINATION bin)

diff --git a/dev-libs/simdjson/metadata.xml b/dev-libs/simdjson/metadata.xml
index cee379b1540..988e8654bc7 100644
--- a/dev-libs/simdjson/metadata.xml
+++ b/dev-libs/simdjson/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<use>
+		<flag name="tools">Build and install extra command line tools</flag>
+	</use>
 </pkgmetadata>

diff --git a/dev-libs/simdjson/simdjson-0.7.0.ebuild b/dev-libs/simdjson/simdjson-0.7.0-r1.ebuild
similarity index 71%
rename from dev-libs/simdjson/simdjson-0.7.0.ebuild
rename to dev-libs/simdjson/simdjson-0.7.0-r1.ebuild
index e1805b6a55b..3c6404e0f47 100644
--- a/dev-libs/simdjson/simdjson-0.7.0.ebuild
+++ b/dev-libs/simdjson/simdjson-0.7.0-r1.ebuild
@@ -15,16 +15,24 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0 Boost-1.0"
 SLOT="0/4"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
+IUSE="test tools"
 
 BDEPEND="
 	sys-apps/file
 	sys-apps/findutils
 	sys-apps/grep
 "
+DEPEND="
+	tools? ( dev-libs/cxxopts )
+"
 
+REQUIRED_USE="test? ( tools )"
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/simdjson-0.7.0-dont-bundle-cssopts.patch"
+)
+
 src_prepare() {
 	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
 	cmake_src_prepare
@@ -32,7 +40,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(usex test '' '-DSIMDJSON_JUST_LIBRARY=ON')
+		$(usex tools '' '-DSIMDJSON_JUST_LIBRARY=ON')
+		-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+		-DSIMDJSON_COMPETITION=OFF
 	)
 
 	cmake_src_configure


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/, dev-libs/simdjson/files/
@ 2020-12-06  2:43 Patrick McLean
  0 siblings, 0 replies; 6+ messages in thread
From: Patrick McLean @ 2020-12-06  2:43 UTC (permalink / raw
  To: gentoo-commits

commit:     41ad8bd14fea96b6b5c96e5e62568bf62d15f292
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 02:43:48 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 02:43:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ad8bd1

dev-libs/simdjson-0.7.0-r3: Revbump, fix file collision

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch   | 7 ++++---
 .../{simdjson-0.7.0-r2.ebuild => simdjson-0.7.0-r3.ebuild}         | 0
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch b/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch
index 1f82151fb3d..f734a65bd89 100644
--- a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch
+++ b/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch
@@ -10,7 +10,7 @@ index 51ab3a31..d3d5e86e 100644
 -import_dependency(cxxopts jarro2783/cxxopts 794c975)
 -add_dependency(cxxopts)
 diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index f1a82be7..217a9fee 100644
+index f1a82be7..5c36d994 100644
 --- a/tools/CMakeLists.txt
 +++ b/tools/CMakeLists.txt
 @@ -1,10 +1,7 @@
@@ -20,10 +20,11 @@ index f1a82be7..217a9fee 100644
 +  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
    add_executable(json2json json2json.cpp)
    add_executable(jsonstats jsonstats.cpp)
-   add_executable(jsonpointer jsonpointer.cpp)
+-  add_executable(jsonpointer jsonpointer.cpp)
++  add_executable(simdjsonpointer jsonpointer.cpp)
    add_executable(minify minify.cpp)
 -else()
 -  message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
 -endif()
 \ No newline at end of file
-+  install(TARGETS json2json jsonstats jsonpointer minify DESTINATION bin)
++  install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin)

diff --git a/dev-libs/simdjson/simdjson-0.7.0-r2.ebuild b/dev-libs/simdjson/simdjson-0.7.0-r3.ebuild
similarity index 100%
rename from dev-libs/simdjson/simdjson-0.7.0-r2.ebuild
rename to dev-libs/simdjson/simdjson-0.7.0-r3.ebuild


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/, dev-libs/simdjson/files/
@ 2021-03-17 17:48 Patrick McLean
  0 siblings, 0 replies; 6+ messages in thread
From: Patrick McLean @ 2021-03-17 17:48 UTC (permalink / raw
  To: gentoo-commits

commit:     b141653d10ae75376ba30710f4776ce553e23a2d
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed Mar 17 17:48:02 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 17:48:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b141653d

dev-libs/simdjson-0.9.0: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/simdjson/Manifest                         |  1 +
 dev-libs/simdjson/files/simdjson-0.9.0-tests.patch | 12 ++++
 dev-libs/simdjson/simdjson-0.9.0.ebuild            | 68 ++++++++++++++++++++++
 3 files changed, 81 insertions(+)

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index f033f83a335..2654789c3b2 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,3 +1,4 @@
 DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
 DIST simdjson-0.8.1.tar.gz 7994048 BLAKE2B 800fbec2b8d20394a894407dea09e3b61302cf6c772dc459b73a97f5ec1e29feb082366d202f5bd835fd54802435e8f437dddbe3ec6db449812b849cd02639b2 SHA512 c4861901595b574e5f1a17abb58f30072bc16e90dc245304019890cd59f172a56c2661410653ff3e4472670541ef2291b3661765f6d64b5f8f70c562b90a3bd0
 DIST simdjson-0.8.2.tar.gz 7994750 BLAKE2B 5d2d69ea4829147efc703677384b95d39d8a97013ba22cbf73721a873683fda8033a52540582f4b7ba060cf46e59898cd743f6e281fb7e61a7cabd4fe3c23701 SHA512 d732b95696b9dcaf648de8536cec181161c846f1e97fa99af6015e39331fbcab39fb6c02378dba810cc75f905cb1c3c6f434fea2fd6f7e11d775aba4ec9b4127
+DIST simdjson-0.9.0.tar.gz 7952791 BLAKE2B 3229cc3cece573c9aa0fe21ba807e7698a038317dd17f7551d2afb79a1104efc0535e8af9b2f504cf00ce0f04a90bb7802507cf3d4188ff5d2dd057b7512d83f SHA512 800ae478e6f47d4e0cf1eb941b1a9f6a5098b2d6027f329ea50b449798798395d4ccab0c84271edcb7fbd2adca125ede3ad6fac3f2508e0af7aade85350af1aa

diff --git a/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch b/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch
new file mode 100644
index 00000000000..49594ca291c
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/ondemand/compilation_failure_tests/CMakeLists.txt b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
+index 2d0959be..324edf80 100644
+--- a/tests/ondemand/compilation_failure_tests/CMakeLists.txt
++++ b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
+@@ -14,6 +14,7 @@ function(add_dual_compile_test TEST_NAME)
+ endfunction(add_dual_compile_test)
+ 
+ 
++target_compile_options(simdjson-internal-flags INTERFACE -Werror=uninitialized)
+ add_dual_compile_test(iterate_char_star)
+ add_dual_compile_test(iterate_string_view)
+ add_dual_compile_test(iterate_temporary_buffer)

diff --git a/dev-libs/simdjson/simdjson-0.9.0.ebuild b/dev-libs/simdjson/simdjson-0.9.0.ebuild
new file mode 100644
index 00000000000..b13f61e541d
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.9.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-0.9.0-tests.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=ON
+		)
+	fi
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/, dev-libs/simdjson/files/
@ 2021-09-08 23:23 Patrick McLean
  0 siblings, 0 replies; 6+ messages in thread
From: Patrick McLean @ 2021-09-08 23:23 UTC (permalink / raw
  To: gentoo-commits

commit:     9e6955223160b1a7675406e106ea471ace8f404e
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  8 23:22:23 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Sep  8 23:22:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e695522

dev-libs/simdjson-1.0.0-r1: Bump, fix bug #812185

Closes: https://bugs.gentoo.org/812185
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../files/simdjson-1.0.0-dont-bundle-cxxopts.patch  | 12 ------------
 .../simdjson-1.0.0-dont-fetch-data-tarball.patch    |  8 +++++---
 .../files/simdjson-1.0.0-install-tools.patch        | 21 +++++++++++++++++++++
 dev-libs/simdjson/files/simdjson-1.0.0-tests.patch  | 17 +++++++++++++++++
 ...mdjson-1.0.0.ebuild => simdjson-1.0.0-r1.ebuild} | 20 +++++++++++++++-----
 5 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/dev-libs/simdjson/files/simdjson-1.0.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-1.0.0-dont-bundle-cxxopts.patch
index 316c4ba4006..f796677655d 100644
--- a/dev-libs/simdjson/files/simdjson-1.0.0-dont-bundle-cxxopts.patch
+++ b/dev-libs/simdjson/files/simdjson-1.0.0-dont-bundle-cxxopts.patch
@@ -18,15 +18,3 @@ index 76651318..2cc06e9e 100644
 -  import_dependency(cxxopts jarro2783/cxxopts 794c975)
 -  add_dependency(cxxopts)
 -endif()
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index f3eaa054..62c34cdd 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -1,6 +1,6 @@
- if(TARGET cxxopts) # we only build the tools if cxxopts is available
-   message(STATUS "We have cxxopts as a dependency and we are building the tools (e.g., json2json).")
--  foreach(tool IN ITEMS json2json jsonstats jsonpointer minify)
-+  foreach(tool IN ITEMS json2json jsonstats simdjsonpointer minify)
-     add_executable("${tool}" "${tool}.cpp")
-     simdjson_apply_props("${tool}")
-     target_link_libraries(

diff --git a/dev-libs/simdjson/files/simdjson-1.0.0-dont-fetch-data-tarball.patch b/dev-libs/simdjson/files/simdjson-1.0.0-dont-fetch-data-tarball.patch
index 2459604d980..b3cd8558b2f 100644
--- a/dev-libs/simdjson/files/simdjson-1.0.0-dont-fetch-data-tarball.patch
+++ b/dev-libs/simdjson/files/simdjson-1.0.0-dont-fetch-data-tarball.patch
@@ -1,14 +1,16 @@
 diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
-index 76651318..91232ce0 100644
+index 76651318..da5029c0 100644
 --- a/dependencies/CMakeLists.txt
 +++ b/dependencies/CMakeLists.txt
-@@ -19,8 +19,7 @@ if(SIMDJSON_GOOGLE_BENCHMARKS)
+@@ -19,8 +19,9 @@ if(SIMDJSON_GOOGLE_BENCHMARKS)
  endif()
  
  # The bulk of our benchmarking and testing data has been moved simdjson/simdjson-data
 -import_dependency(simdjson-data simdjson/simdjson-data a5b13babe65c1bba7186b41b43d4cbdc20a5c470)
 -add_dependency(simdjson-data)
-+add_subdirectory(simdjson-data dependencies/simdjson-data)
++if(SIMDJSON_TESTS)
++  add_subdirectory(simdjson-data dependencies/simdjson-data)
++endif()
  
  # This prevents variables declared with set() from unnecessarily escaping and
  # should not be called more than once

diff --git a/dev-libs/simdjson/files/simdjson-1.0.0-install-tools.patch b/dev-libs/simdjson/files/simdjson-1.0.0-install-tools.patch
new file mode 100644
index 00000000000..10d33231560
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-1.0.0-install-tools.patch
@@ -0,0 +1,21 @@
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index f3eaa054..4eaff3d1 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -1,12 +1,13 @@
+-if(TARGET cxxopts) # we only build the tools if cxxopts is available
++if(SIMDJSON_TOOLS)
+   message(STATUS "We have cxxopts as a dependency and we are building the tools (e.g., json2json).")
+-  foreach(tool IN ITEMS json2json jsonstats jsonpointer minify)
++  foreach(tool IN ITEMS json2json jsonstats simdjsonpointer minify)
+     add_executable("${tool}" "${tool}.cpp")
+     simdjson_apply_props("${tool}")
+     target_link_libraries(
+         "${tool}" PRIVATE
+-        simdjson simdjson-internal-flags simdjson-windows-headers cxxopts
++        simdjson simdjson-internal-flags simdjson-windows-headers
+     )
++    install(TARGETS "${tool}")
+   endforeach()
+ else()
+   message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")

diff --git a/dev-libs/simdjson/files/simdjson-1.0.0-tests.patch b/dev-libs/simdjson/files/simdjson-1.0.0-tests.patch
new file mode 100644
index 00000000000..cccbd449466
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-1.0.0-tests.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 235222a8..8532183a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -221,9 +221,10 @@ add_subdirectory(singleheader)
+ #
+ # Compile tools / tests / benchmarks
+ #
+-add_subdirectory(tests)
++if (SIMDJSON_TESTS)
++  add_subdirectory(tests)
++endif()
+ add_subdirectory(examples)
+-add_subdirectory(benchmark)
+ add_subdirectory(fuzz)
+ 
+ #

diff --git a/dev-libs/simdjson/simdjson-1.0.0.ebuild b/dev-libs/simdjson/simdjson-1.0.0-r1.ebuild
similarity index 78%
rename from dev-libs/simdjson/simdjson-1.0.0.ebuild
rename to dev-libs/simdjson/simdjson-1.0.0-r1.ebuild
index c68fa749db0..4ad5cdab99d 100644
--- a/dev-libs/simdjson/simdjson-1.0.0.ebuild
+++ b/dev-libs/simdjson/simdjson-1.0.0-r1.ebuild
@@ -37,6 +37,8 @@ PATCHES=(
 	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
 	"${FILESDIR}/simdjson-0.9.0-tests.patch"
 	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-1.0.0-tests.patch"
 )
 
 DOCS=(
@@ -48,27 +50,35 @@ DOCS=(
 )
 
 src_prepare() {
-	mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
+	if use test; then
+		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
+	fi
+
 	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
 	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
 	cmake_src_prepare
 }
 
 src_configure() {
 	local -a mycmakeargs=(
 		-DSIMDJSON_ENABLE_THREADS=ON
-		-DSIMDJSON_ALLOW_DOWNLOADS=OFF
+	)
+	use test && mycmakeargs+=(
+		-DSIMDJSON_TESTS=ON
 	)
 
 	if use tools; then
 		mycmakeargs+=(
-			-DSIMDJSON_JUST_LIBRARY=OFF
+			-DSIMDJSON_DEVELOPER_MODE=ON
+			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
 			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
 			-DSIMDJSON_COMPETITION=OFF
+			-DSIMDJSON_TOOLS=ON
 		)
-	else
+	elif ! use test; then
 		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=ON
+			-DSIMDJSON_DEVELOPER_MODE=OFF
 		)
 	fi
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/, dev-libs/simdjson/files/
@ 2023-04-10 18:19 Patrick McLean
  0 siblings, 0 replies; 6+ messages in thread
From: Patrick McLean @ 2023-04-10 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     d5a31690f679bddbf7bb83c92d7c50d44d638034
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 18:19:02 2023 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 18:19:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a31690

dev-libs/simdjson: add 3.1.7

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/simdjson/Manifest                         |  1 +
 dev-libs/simdjson/files/simdjson-3.1.7-tests.patch | 21 ++++++
 dev-libs/simdjson/simdjson-3.1.7.ebuild            | 87 ++++++++++++++++++++++
 3 files changed, 109 insertions(+)

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index d327e3b3db32..eaa0819e8dbc 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,4 +1,5 @@
 DIST simdjson-3.0.0.gh.tar.gz 1628275 BLAKE2B eef18be927c50527885f6e042ef22317b7e6da6a77d652a4415b98ec7fda227a1b3b798774c12b587a1a011b16c4011a0656f1bf1a20886432796e64076f4775 SHA512 4ea58cd4d059f5e83734f8f084056a58a587529e13df5c47fbb42b141052688f8517ab4e7d6cd4581c6b560f8804968fa0c9c7184b1d8d54e45c280302a069ec
 DIST simdjson-3.1.1.gh.tar.gz 1633897 BLAKE2B a2bc394bfbf7916bc7743d3891b84eb3743cce2998242ecb427a7a3357986ea90c6ee546c3048aeb5629c9475f9ce862038f349ced51f684d199441632cca7ef SHA512 fb7d0963236c8fa692bf6c4ed2a66da5b29632c02e357894e0d5c604467e82f9a56cc7e8229769d9e401ed5bf5dfb25ae46f40fbe68605cedf58d763d03af93f
 DIST simdjson-3.1.6.gh.tar.gz 1643625 BLAKE2B 547eec2c332ffbc63a3878582b12b611447170c659e56e7d3e9c7a264427b5c8550f376cd2070b7f84f7603005ae4f9ef78a4ae7bd02df9b6813626b2ac2a6a9 SHA512 72f27b010e659025f9c8842daf79364d0d0f40cddd66858956ab4fa4f3f3a631fe342f440201d58ed9af42a4356aafafaac8d3caf3317dd1a6314dad3a71081a
+DIST simdjson-3.1.7.gh.tar.gz 1648370 BLAKE2B 46ca65569ba4fcf80bac1e1670bd0dea172c5d157f2ed05135c64c620bc7361f894d7227513545e0112643fd75d93bac02b3d0488ea0efe0401dbf5946d332b2 SHA512 6b54723720aa83333816e3bbd5cfe8dc71b087ac1d20d8982601563b70146bd63629a9f74cbc460a78ab2c83c689991586ef20a268fc67946b57dcc3f5486bc5
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1

diff --git a/dev-libs/simdjson/files/simdjson-3.1.7-tests.patch b/dev-libs/simdjson/files/simdjson-3.1.7-tests.patch
new file mode 100644
index 000000000000..dd254be00a73
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-3.1.7-tests.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ba15fe93..6993bdd5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -249,12 +249,11 @@ add_subdirectory(singleheader)
+ #
+ # Compile tools / tests / benchmarks
+ #
+-add_subdirectory(tests)
+-add_subdirectory(examples)
+-if(CMAKE_SIZEOF_VOID_P EQUAL 8) # we only include the benchmarks on 64-bit systems.
+-  add_subdirectory(benchmark)
++if (SIMDJSON_TESTS)
++  add_subdirectory(tests)
++  add_subdirectory(fuzz)
+ endif()
+-add_subdirectory(fuzz)
++add_subdirectory(examples)
+ 
+ #
+ # Source files should be just ASCII

diff --git a/dev-libs/simdjson/simdjson-3.1.7.ebuild b/dev-libs/simdjson/simdjson-3.1.7.ebuild
new file mode 100644
index 000000000000..433f9a71935e
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-3.1.7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs cmake
+
+DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/grep
+	virtual/pkgconfig
+"
+DEPEND="
+	tools? ( <dev-libs/cxxopts-3.1:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-0.9.0-tests.patch"
+	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-3.1.7-tests.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
+	fi
+
+	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
+	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
+	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+	use test && mycmakeargs+=(
+		-DSIMDJSON_TESTS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=ON
+			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+			-DSIMDJSON_TOOLS=ON
+		)
+	elif ! use test; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=OFF
+		)
+	fi
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/, dev-libs/simdjson/files/
@ 2024-08-30 21:30 Patrick McLean
  0 siblings, 0 replies; 6+ messages in thread
From: Patrick McLean @ 2024-08-30 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     b91e6fe89f23f76e443d1617bf93722232c61be6
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 21:28:08 2024 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 21:29:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91e6fe8

dev-libs/simdjson: add 3.10.1

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/simdjson/Manifest                         |   1 +
 .../simdjson-3.10.0-dont-bundle-cxxopts.patch      |  20 ++++
 .../simdjson/files/simdjson-3.10.1-tests.patch     |  33 +++++++
 dev-libs/simdjson/simdjson-3.10.1.ebuild           | 102 +++++++++++++++++++++
 4 files changed, 156 insertions(+)

diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 718356e50168..b7882fecd346 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,3 +1,4 @@
+DIST simdjson-3.10.1.gh.tar.gz 2652674 BLAKE2B 3ccfc55d5bf8ce6a7e8be1b6cb28ed7b6289e23b1d4fe8505e35a42f4ff32a0ee7f500402828164bdeacae1b72e238413575288082151723d6d0c87dcefd1fa0 SHA512 b19fde8d81eaff34b83bb41028d7ee3a408ae5bc896277148e96879b1cba1a7cfc4af0064973bcb07e2b56e0955c3a3a581910d7af23d68510374e7f297c3b7c
 DIST simdjson-3.6.3.gh.tar.gz 2302220 BLAKE2B c46eeb8a07460cc5427fc35714fd262069cd3d913732e6037d808281d0fed0e82e0423dfd16abaeb515264559fe4454c42f81211354723eb21b212decfe7834b SHA512 b9fa7e554ded4e6cbe9d70ee29aa5b582e58b8b2ada1a781e58746082bb7d31791a4e2ea8b43d9391d783e61e489554f260448029c0b7e730cc69dc44f4aa86a
 DIST simdjson-3.9.1.gh.tar.gz 2636602 BLAKE2B 82c4956ebc902574ed1b36196097c6c07e9ca0f11384f71b260ae95ff5e7c436ce016da417197f84c21ece0ae2239fc1c4e02cf63672fae98b3fa69831de3adb SHA512 b8c091e7ecce4cdc67f538ab6715ce89bff16e68f6d56bdc37e05ab0b110b90bc6b039d5c76e2dceef9e30f35cb6ace5e4e230d4c70e928329a376f989b23bed
 DIST simdjson-3.9.3.gh.tar.gz 2643869 BLAKE2B f2e0f8d13a234c7ee639a57333b66a464312a20bd67f808688f6456ded7b6bdac75d857b10207adc03e05d89e701efe874d068774a90c3082d9e83792ed784d1 SHA512 893ce0cb380b1418438f5910262325031f8071c4577589a491713f91c980964b4105c1e1aa7f2b9373deed40ecf6b48fe48a1aa243151e424f138f5418e4821c

diff --git a/dev-libs/simdjson/files/simdjson-3.10.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-3.10.0-dont-bundle-cxxopts.patch
new file mode 100644
index 000000000000..cd735888b232
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-3.10.0-dont-bundle-cxxopts.patch
@@ -0,0 +1,20 @@
+diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
+index b9802392..056a0635 100644
+--- a/dependencies/CMakeLists.txt
++++ b/dependencies/CMakeLists.txt
+@@ -146,15 +146,3 @@ endfunction()
+ if(SIMDJSON_COMPETITION)
+   competition_scope_()
+ endif()
+-
+-cmake_dependent_option(SIMDJSON_CXXOPTS "Download cxxopts (necessary for tools)" ON
+-        SIMDJSON_ALLOW_DOWNLOADS OFF)
+-
+-if(SIMDJSON_CXXOPTS)
+-  set_off(CXXOPTS_BUILD_EXAMPLES)
+-  set_off(CXXOPTS_BUILD_TESTS)
+-  set_off(CXXOPTS_ENABLE_INSTALL)
+-
+-  import_dependency(cxxopts jarro2783/cxxopts 5965670)
+-  add_dependency(cxxopts)
+-endif()

diff --git a/dev-libs/simdjson/files/simdjson-3.10.1-tests.patch b/dev-libs/simdjson/files/simdjson-3.10.1-tests.patch
new file mode 100644
index 000000000000..a5eade492ec6
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-3.10.1-tests.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca23a8a0..0bf54dd6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -303,12 +303,11 @@ endif()
+ #
+ # Compile tools / tests / benchmarks
+ #
+-add_subdirectory(tests)
+-add_subdirectory(examples)
+-if(CMAKE_SIZEOF_VOID_P EQUAL 8) # we only include the benchmarks on 64-bit systems.
+-  add_subdirectory(benchmark)
++if (SIMDJSON_TESTS)
++  add_subdirectory(tests)
++  add_subdirectory(fuzz)
+ endif()
+-add_subdirectory(fuzz)
++add_subdirectory(examples)
+ 
+ #
+ # Source files should be just ASCII
+diff --git a/tests/ondemand/compilation_failure_tests/CMakeLists.txt b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
+index 54b74afb..b14567d3 100644
+--- a/tests/ondemand/compilation_failure_tests/CMakeLists.txt
++++ b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
+@@ -13,6 +13,7 @@ function(add_dual_compile_test TEST_NAME)
+   target_compile_definitions(${TEST_NAME}_should_not_compile PRIVATE COMPILATION_TEST_USE_FAILING_CODE=1)
+ endfunction(add_dual_compile_test)
+ 
++target_compile_options(simdjson-internal-flags INTERFACE -Werror=uninitialized)
+ add_dual_compile_test(iterate_object)
+ add_dual_compile_test(iterate_array)
+ add_dual_compile_test(iterate_char_star)

diff --git a/dev-libs/simdjson/simdjson-3.10.1.ebuild b/dev-libs/simdjson/simdjson-3.10.1.ebuild
new file mode 100644
index 000000000000..26ee1b77d4e9
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-3.10.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs cmake
+
+DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/23"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
+IUSE="+all-impls test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/grep
+	virtual/pkgconfig
+"
+DEPEND="
+	tools? ( >=dev-libs/cxxopts-3.2:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-3.10.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-3.7.1-data-optional.patch"
+	"${FILESDIR}/simdjson-3.10.1-tests.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	if use test; then
+		mkdir "${S}/dependencies/.cache" || die
+		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/.cache/${PN}-data" || die
+	fi
+
+	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
+	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
+	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS:BOOL=ON
+	)
+	use test && mycmakeargs+=(
+		-DSIMDJSON_TESTS:BOOL=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE:BOOL=ON
+			-DSIMDJSON_ALLOW_DOWNLOADS:BOOL=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS:BOOL=OFF
+			-DSIMDJSON_COMPETITION:BOOL=OFF
+			-DSIMDJSON_TOOLS:BOOL=ON
+		)
+	elif ! use test; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODELBOOL=OFF
+		)
+	fi
+
+	if use all-impls; then
+		local -a impls=("fallback")
+		if use amd64; then
+			impls+=("westmere" "haswell" "icelake")
+		elif use arm64; then
+			impls+=("arm64")
+		elif use ppc64; then
+			impls+=("ppc64")
+		fi
+
+		mycmakeargs+=(
+			-DSIMDJSON_IMPLEMENTATION:STRING=$(printf '%s;' "${impls[@]}")
+		)
+	fi
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-08-30 21:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-05 21:39 [gentoo-commits] repo/gentoo:master commit in: dev-libs/simdjson/, dev-libs/simdjson/files/ Patrick McLean
  -- strict thread matches above, loose matches on Subject: below --
2020-12-06  2:43 Patrick McLean
2021-03-17 17:48 Patrick McLean
2021-09-08 23:23 Patrick McLean
2023-04-10 18:19 Patrick McLean
2024-08-30 21:30 Patrick McLean

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox