gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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@gentoo.org>
This commit is contained in:
Patrick McLean
2020-12-05 13:38:57 -08:00
parent 18c4bef990
commit 27e2fddc3c
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch Normal file
View File

@@ -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)

3
dev-libs/simdjson/metadata.xml
View File

@@ -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>

14
dev-libs/simdjson/simdjson-0.7.0.ebuild → dev-libs/simdjson/simdjson-0.7.0-r1.ebuild
View File

@@ -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