commit: 24c755dc2ad54e7add8c111233094b5db08b0909
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 4 20:11:49 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 4 20:16:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c755dc
dev-libs/leveldb: various fixes
- Redirect test suite temp directories to ${T}. This fixes an issue
I had when running the test suite in some arm chroots.
- Remove crc32c USE flag (otherwise uses bundled same code)
- Add flags during compilation for the USE flags
- Fix SLOT deps for app-arch/snappy and dev-util/google-perftools
(thanks iwdevtools for noting those)
- small styling fixes
- all those changes were tested on all stabilized arches just to be
sure.
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
...{leveldb-1.23-r2.ebuild => leveldb-1.23-r3.ebuild} | 19 +++++++++++++------
dev-libs/leveldb/metadata.xml | 3 ---
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/dev-libs/leveldb/leveldb-1.23-r2.ebuild
b/dev-libs/leveldb/leveldb-1.23-r3.ebuild
similarity index 75%
rename from dev-libs/leveldb/leveldb-1.23-r2.ebuild
rename to dev-libs/leveldb/leveldb-1.23-r3.ebuild
index 9adbd1551ad0..13684bcf2b50 100644
--- a/dev-libs/leveldb/leveldb-1.23-r2.ebuild
+++ b/dev-libs/leveldb/leveldb-1.23-r3.ebuild
@@ -12,13 +12,14 @@
SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.
LICENSE="BSD"
SLOT="0/1"
KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux
~x86-linux"
-IUSE="+crc32c +snappy +tcmalloc test"
-
+IUSE="+snappy +tcmalloc test"
RESTRICT="!test? ( test )"
-DEPEND="crc32c? ( dev-libs/crc32c )
- snappy? ( app-arch/snappy )
- tcmalloc? ( dev-util/google-perftools )"
+DEPEND="
+ dev-libs/crc32c
+ snappy? ( app-arch/snappy:= )
+ tcmalloc? ( dev-util/google-perftools:= )
+"
RDEPEND="${DEPEND}"
BDEPEND="test? ( dev-cpp/gtest )"
@@ -34,9 +35,15 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
+ -DHAVE_CRC32C=ON
-DLEVELDB_BUILD_BENCHMARKS=OFF
+ -DHAVE_SNAPPY=$(usex snappy)
+ -DHAVE_TCMALLOC=$(usex tcmalloc)
-DLEVELDB_BUILD_TESTS=$(usex test)
)
cmake_src_configure
}
+
+src_test() {
+ TEST_TMPDIR="${T}" TEMP="${T}" cmake_src_test
+}
diff --git a/dev-libs/leveldb/metadata.xml b/dev-libs/leveldb/metadata.xml
index e937f6bb5998..0c3bde759c88 100644
--- a/dev-libs/leveldb/metadata.xml
+++ b/dev-libs/leveldb/metadata.xml
@@ -9,7 +9,4 @@
<remote-id type="github">google/leveldb</remote-id>
<bugs-to>https://github.com/google/leveldb/issues</bugs-to>
</upstream>
- <use>
- <flag name="crc32c">Link against <pkg>dev-libs/crc32c</pkg> for
accelerated CRC32C calculation</flag>
- </use>
</pkgmetadata>
