diff options
| author |   Sam James <sam@gentoo.org> | 2020-10-11 19:32:52 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2020-10-11 19:36:02 +0000 |
| commit | 7563fef0f2908da3ccd1f42ce2dfc4ac8c4580d0 (patch) | |
| tree | f20d80d7b5840bc6d311e0163c1cada91afdacbe | |
| parent | profiles/package.mask: adjust Wireshark mask message (diff) | |
| download | gentoo-7563fef0.tar.gz gentoo-7563fef0.tar.bz2 gentoo-7563fef0.zip | |
Revert "profiles/package.mask: adjust Wireshark mask message"
Accidentally included an unrelated staged fix.
This reverts commit 7f330da7d87d963fe68d78b858dbe0be8a2fc252.
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild | 10 | ||||
| -rw-r--r-- | profiles/package.mask | 7 |
2 files changed, 6 insertions, 11 deletions
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild index 691afb13f9c1..8c50916e83e9 100644 --- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild +++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild @@ -26,17 +26,11 @@ DOCS=( ChangeLog.md README.md ) src_configure() { local mycmakeargs=( + -DJSON_BuildTests=$(usex test) + -DJSON_TestDataDirectory="${S}/json_test_data" -DJSON_MultipleHeaders=ON ) - if use test ; then - # Define test data directory here to avoid unused var QA warning - # #747826 - mycmakeargs+=( - -DJSON_BuildTests=ON - -DJSON_TestDataDirectory="${S}/json_test_data" - ) - fi cmake_src_configure } diff --git a/profiles/package.mask b/profiles/package.mask index f59706fab2d7..22c355f33987 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -43,9 +43,10 @@ net-fs/openafs-kernel # Sam James <sam@gentoo.org> (2020-10-11) # Current Wireshark in ~arch is vulnerable. -# This forces a downgrade to the stable, fixed -# Wireshark. -# bug #744592 +# Maintainer did not want to update after QA +# intervention. +# Please use stable Wireshark for now. +# 744592 =net-analyzer/wireshark-3.3.0 # Sergei Trofimovich <slyfox@gentoo.org> (2020-10-11) |