[gentoo-commits] repo/gentoo:master commit in: dev-libs/leveldb/files/, dev-libs/leveldb/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/leveldb/files/, dev-libs/leveldb/
@ 2021-04-25 18:06 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-04-25 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     a81257e3c45a87f4a8454d41656cf2a489b9b9ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 08:51:29 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 18:04:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a81257e3

dev-libs/leveldb: Drop 1.18-r2, EAPI5--, overshadowed by 1.20

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/leveldb/Manifest                          |  1 -
 dev-libs/leveldb/files/leveldb-1.18-mips.patch     | 48 ---------------
 .../leveldb/files/leveldb-1.9.0-memenv-so.patch    | 60 ------------------
 dev-libs/leveldb/leveldb-1.18-r2.ebuild            | 72 ----------------------
 4 files changed, 181 deletions(-)

diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 5300c8eab87..bc1f7b31856 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1,2 +1 @@
-DIST leveldb-1.18.tar.gz 209376 BLAKE2B 08d63fe8aed45d38befd29caddee5a229ff847d254b30be55715793a621e840641d53af47e4fd93286ff0445d6001be26aa00063c075681659f7ceb692184249 SHA512 3d9c55a7bf8692914784ec33c273704ce9978496b071c7b661708f049d0d4ccd51a44441f50c3e536725caeb9896575192f52708a4bb1c0222cecdeec89919a3
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2

diff --git a/dev-libs/leveldb/files/leveldb-1.18-mips.patch b/dev-libs/leveldb/files/leveldb-1.18-mips.patch
deleted file mode 100644
index 379223d210b..00000000000
--- a/dev-libs/leveldb/files/leveldb-1.18-mips.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/google/leveldb/pull/272
-
-From f216400e702a51c900f2ce0285fdd6a21d3dd87b Mon Sep 17 00:00:00 2001
-From: Ben Chan <benchan@chromium.org>
-Date: Thu, 11 Sep 2014 21:38:48 -0700
-Subject: [PATCH] CHROMIUMOS: Add memory barrier implementation for MIPS.
-
-This CL is based on the patch authored by David Turner <digit@google.com>,
-see https://code.google.com/p/leveldb/issues/detail?id=109
-
-BUG=chromium:413517
-TEST=`emerge-{x86,amd64,arm,mipsel-o32}-generic leveldb`
-
-Reviewed-on: https://chromium-review.googlesource.com/217834
----
- port/atomic_pointer.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h
-index 35ae550..341909e 100644
---- a/port/atomic_pointer.h
-+++ b/port/atomic_pointer.h
-@@ -36,6 +36,8 @@
- #define ARCH_CPU_X86_FAMILY 1
- #elif defined(__ARMEL__)
- #define ARCH_CPU_ARM_FAMILY 1
-+#elif defined(__mips__)
-+#define ARCH_CPU_MIPS_FAMILY 1
- #elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
- #define ARCH_CPU_PPC_FAMILY 1
- #endif
-@@ -83,6 +85,13 @@ inline void MemoryBarrier() {
- }
- #define LEVELDB_HAVE_MEMORY_BARRIER
- 
-+// MIPS
-+#elif defined(ARCH_CPU_MIPS_FAMILY) && defined(__GNUC__)
-+inline void MemoryBarrier() {
-+  __asm__ __volatile__("sync" : : : "memory");
-+}
-+#define LEVELDB_HAVE_MEMORY_BARRIER
-+
- #endif
- 
- // AtomicPointer built using platform-specific MemoryBarrier()
--- 
-2.3.0
-

diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch b/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch
deleted file mode 100644
index 0df587a3f9c..00000000000
--- a/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- leveldb-1.9.0.orig/Makefile	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/Makefile	2014-03-28 22:11:05.000000000 +0000
-@@ -61,37 +61,45 @@
- # Should we build shared libraries?
- ifneq ($(PLATFORM_SHARED_EXT),)
- 
-+SHARED1 = $(PLATFORM_SHARED_EXT)
-+
- ifneq ($(PLATFORM_SHARED_VERSIONED),true)
--SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
- SHARED2 = $(SHARED1)
- SHARED3 = $(SHARED1)
--SHARED = $(SHARED1)
-+SHARED=%.$(SHARED1)
- else
- # Update db.h if you change these.
- SHARED_MAJOR = 1
- SHARED_MINOR = 9
--SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
- SHARED2 = $(SHARED1).$(SHARED_MAJOR)
- SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR)
--SHARED = $(SHARED1) $(SHARED2) $(SHARED3)
--$(SHARED1): $(SHARED3)
--	ln -fs $(SHARED3) $(SHARED1)
--$(SHARED2): $(SHARED3)
--	ln -fs $(SHARED3) $(SHARED2)
-+SHARED=%.$(SHARED1) %.$(SHARED2) %.$(SHARED3)
-+%.$(SHARED1): %.$(SHARED3)
-+	ln -fs $< $@
-+%.$(SHARED2): %.$(SHARED3)
-+	ln -fs $< $@
- endif
- 
--$(SHARED3):
--	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) $(LIBS)
-+%.SHARED: $(SHARED)
-+	@true
-+
-+%.$(SHARED3):
-+	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$*.$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $^ -o $@ $(LIBS)
-+
-+libleveldb.$(SHARED3): $(SOURCES)
-+libmemenv.$(SHARED3): $(MEMENV_SOURCES)
-+
-+.SECONDARY: $(subst %,libleveldb,$(SHARED)) $(subst %,libmemenv,$(SHARED))
- 
- endif  # PLATFORM_SHARED_EXT
- 
--all: $(SHARED) $(LIBRARY)
-+all: libleveldb.SHARED $(LIBRARY)
- 
- check: all $(PROGRAMS) $(TESTS)
- 	for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done
- 
- clean:
--	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk
-+	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(subst %,libleveldb,$(SHARED)) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk
- 	-rm -rf ios-x86/* ios-arm/*
- 
- $(LIBRARY): $(LIBOBJECTS)

diff --git a/dev-libs/leveldb/leveldb-1.18-r2.ebuild b/dev-libs/leveldb/leveldb-1.18-r2.ebuild
deleted file mode 100644
index 30880ffd674..00000000000
--- a/dev-libs/leveldb/leveldb-1.18-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch multilib toolchain-funcs versionator
-
-DESCRIPTION="A fast key-value storage library written at Google"
-HOMEPAGE="http://leveldb.org/ https://github.com/google/leveldb"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc kernel_FreeBSD"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy:=
-		static-libs? ( app-arch/snappy[static-libs(-)] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.18-mips.patch
-	epatch "${FILESDIR}"/${PN}-1.18-configure.patch #541186
-
-	local SHARED_MINOR=$(get_version_component_range 2)
-	sed \
-		-e "s/\(^ SHARED_MINOR =\).*/\1 ${SHARED_MINOR}/" \
-		"${FILESDIR}/${PN}-1.9.0-memenv-so.patch" > memenv-so.patch
-	epatch memenv-so.patch
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	local targetos
-	if use kernel_FreeBSD; then
-		targetos="FreeBSD"
-	else
-		targetos="Linux"
-	fi
-
-	TARGET_OS=${targetos} \
-	USE_SNAPPY=$(usex snappy) \
-	USE_TCMALLOC=no \
-	TMPDIR=${T} \
-	sh -x ./build_detect_platform build_config.mk ./
-}
-
-src_compile() {
-	emake $(usex static-libs 'libmemenv.a' 'LIBRARY=') all libmemenv.SHARED
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/*
-	# This matches the path Debian picked.  Upstream provides no guidance.
-	insinto /usr/include/leveldb/helpers
-	doins helpers/memenv/memenv.h
-
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a libmemenv.a
-	dolib.so libmemenv*$(get_libname)*
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/leveldb/files/, dev-libs/leveldb/
@ 2021-08-13 15:20 Marek Szuba
  0 siblings, 0 replies; 4+ messages in thread
From: Marek Szuba @ 2021-08-13 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     aad4b3e0fe8379f6fa34c7b48b4584590025760c
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 13 15:17:07 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Aug 13 15:17:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad4b3e0

dev-libs/leveldb: add 1.23

Suggested-by: Arthur Zamarin <arthurzam+gentoo <AT> gmail.com>
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-libs/leveldb/Manifest                          |  1 +
 .../files/leveldb-1.23-system-testdeps.patch       | 25 ++++++++++++++
 dev-libs/leveldb/leveldb-1.23.ebuild               | 39 ++++++++++++++++++++++
 dev-libs/leveldb/metadata.xml                      |  3 ++
 4 files changed, 68 insertions(+)

diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index bc1f7b31856..26c4a7fc073 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1 +1,2 @@
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
+DIST leveldb-1.23.tar.gz 242925 BLAKE2B ef9ac853cdc2f376b9b4299c1017db8c262cb318ad771f40fe81c9fb71ea06ee56ac533b3e8af4e6fdd28577a2f87cfd103ecb49098187d099ccd6019b8ca1d2 SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84

diff --git a/dev-libs/leveldb/files/leveldb-1.23-system-testdeps.patch b/dev-libs/leveldb/files/leveldb-1.23-system-testdeps.patch
new file mode 100644
index 00000000000..232d74aa2cc
--- /dev/null
+++ b/dev-libs/leveldb/files/leveldb-1.23-system-testdeps.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -296,20 +296,12 @@
+   set(build_gmock ON)
+ 
+   # This project is tested using GoogleTest.
+-  add_subdirectory("third_party/googletest")
++  find_package(GTest REQUIRED)
+ 
+   # This project uses Google benchmark for benchmarking.
+   set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
+   set(BENCHMARK_ENABLE_EXCEPTIONS OFF CACHE BOOL "" FORCE)
+-  add_subdirectory("third_party/benchmark")
+-
+-  # GoogleTest triggers a missing field initializers warning.
+-  if(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)
+-    set_property(TARGET gtest
+-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+-    set_property(TARGET gmock
+-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+-  endif(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)
++  find_package(benchmark REQUIRED)
+ 
+   function(leveldb_test test_file)
+     get_filename_component(test_target_name "${test_file}" NAME_WE)

diff --git a/dev-libs/leveldb/leveldb-1.23.ebuild b/dev-libs/leveldb/leveldb-1.23.ebuild
new file mode 100644
index 00000000000..41aa3b4d7de
--- /dev/null
+++ b/dev-libs/leveldb/leveldb-1.23.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A fast key-value storage library written at Google"
+HOMEPAGE="https://github.com/google/leveldb"
+SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+crc32c +snappy +tcmalloc test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="crc32c? ( dev-libs/crc32c )
+	snappy? ( app-arch/snappy )
+	tcmalloc? ( dev-util/google-perftools )"
+RDEPEND="${DEPEND}"
+BDEPEND="test? (
+	dev-cpp/benchmark
+	dev-cpp/gtest
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.23-system-testdeps.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DLEVELDB_BUILD_BENCHMARKS=OFF
+		-DLEVELDB_BUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}

diff --git a/dev-libs/leveldb/metadata.xml b/dev-libs/leveldb/metadata.xml
index 3e973eed20b..f502f37ef4c 100644
--- a/dev-libs/leveldb/metadata.xml
+++ b/dev-libs/leveldb/metadata.xml
@@ -6,4 +6,7 @@
     <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>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/leveldb/files/, dev-libs/leveldb/
@ 2022-02-04 20:16 Arthur Zamarin
  0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2022-02-04 20:16 UTC (permalink / raw
  To: gentoo-commits

commit:     5d0bd6ede5c8f6107be8c62ea98ec9aafe79c58a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 19:58:45 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 20:16:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d0bd6ed

dev-libs/leveldb: drop 1.20, 1.23-r1

Closes: https://github.com/gentoo/gentoo/pull/12745
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-libs/leveldb/Manifest                          |  1 -
 .../leveldb/files/leveldb-1.18-configure.patch     | 52 ------------------
 .../leveldb/files/leveldb-1.20-memenv-so.patch     | 33 -----------
 dev-libs/leveldb/leveldb-1.20.ebuild               | 64 ----------------------
 dev-libs/leveldb/leveldb-1.23-r1.ebuild            | 37 -------------
 5 files changed, 187 deletions(-)

diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 26c4a7fc073c..02ce0049311b 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1,2 +1 @@
-DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
 DIST leveldb-1.23.tar.gz 242925 BLAKE2B ef9ac853cdc2f376b9b4299c1017db8c262cb318ad771f40fe81c9fb71ea06ee56ac533b3e8af4e6fdd28577a2f87cfd103ecb49098187d099ccd6019b8ca1d2 SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84

diff --git a/dev-libs/leveldb/files/leveldb-1.18-configure.patch b/dev-libs/leveldb/files/leveldb-1.18-configure.patch
deleted file mode 100644
index ba30fc731ad5..000000000000
--- a/dev-libs/leveldb/files/leveldb-1.18-configure.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-we'll handle configure ourselves in src_configure
-
---- a/Makefile
-+++ b/Makefile
-@@ -14,9 +14,6 @@ OPT ?= -O2 -DNDEBUG
- # OPT ?= -O2 -g2 -DNDEBUG
- #-----------------------------------------------
- 
--# detect what platform we're building on
--$(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \
--    ./build_detect_platform build_config.mk ./)
- # this file is generated by the previous line to set build flags and sources
- include build_config.mk
- 
-
-control snappy/tcmalloc explicitly
-
---- a/build_detect_platform
-+++ a/build_detect_platform
-@@ -190,6 +190,7 @@
-         COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
-     fi
- 
-+if [ "${USE_SNAPPY:-auto}" = "auto" ]; then
-     # Test whether Snappy library is installed
-     # http://code.google.com/p/snappy/
-     $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null  <<EOF
-@@ -197,15 +198,24 @@
-       int main() {}
- EOF
-     if [ "$?" = 0 ]; then
-+        USE_SNAPPY="yes"
-+    fi
-+fi
-+    if [ "$USE_SNAPPY" = "yes" ]; then
-         COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
-         PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
-     fi
- 
-+if [ "${USE_TCMALLOC:-auto}" = "auto" ]; then
-     # Test whether tcmalloc is available
-     $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null  <<EOF
-       int main() {}
- EOF
-     if [ "$?" = 0 ]; then
-+        USE_TCMALLOC="yes"
-+    fi
-+fi
-+    if [ "$USE_TCMALLOC" = "yes" ]; then
-         PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
-     fi
- 

diff --git a/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch b/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch
deleted file mode 100644
index d443ef0ad262..000000000000
--- a/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# Create libmemenv.so and don't compile programs by default
-# Add a static_programs target to compile test programs
---- a/Makefile	2018-06-03 16:52:28.839614213 +0200
-+++ b/Makefile	2018-06-03 16:52:18.209544310 +0200
-@@ -128,15 +128,27 @@
- 	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1)
- $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3)
- 	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2)
-+SHARED_MEMENV_LIB1 = libmemenv.$(PLATFORM_SHARED_EXT)
-+SHARED_MEMENV_LIB2 = $(SHARED_MEMENV_LIB1).$(SHARED_VERSION_MAJOR)
-+SHARED_MEMENV_LIB3 = $(SHARED_MEMENV_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
-+SHARED_MEMENV_LIBS = $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3)
-+$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1): $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3)
-+	ln -fs $(SHARED_MEMENV_LIB3) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1)
-+$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2): $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3)
-+	ln -fs $(SHARED_MEMENV_LIB3) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2)
- SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a
- endif
- 
- $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
- 	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_LIB2) $(SHARED_LIBOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_LIB3) $(LIBS)
-+$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3): $(SHARED_MEMENVOBJECTS)
-+	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_MEMENV_LIB2) $(SHARED_MEMENVOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3) $(LIBS)
- 
- endif  # PLATFORM_SHARED_EXT
- 
--all: $(SHARED_LIBS) $(SHARED_PROGRAMS) $(STATIC_OUTDIR)/libleveldb.a $(STATIC_OUTDIR)/libmemenv.a $(STATIC_PROGRAMS)
-+all: $(SHARED_LIBS) $(SHARED_MEMENV_LIBS)
-+
-+static_programs: $(STATIC_PROGRAMS)
- 
- check: $(STATIC_PROGRAMS)
- 	for t in $(notdir $(TESTS)); do echo "***** Running $$t"; $(STATIC_OUTDIR)/$$t || exit 1; done

diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
deleted file mode 100644
index 6961f094c8cc..000000000000
--- a/dev-libs/leveldb/leveldb-1.20.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-# https://github.com/google/leveldb/issues/536
-SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy:=
-	)"
-RDEPEND="${DEPEND}"
-
-# https://bugs.gentoo.org/651604
-REQUIRED_USE="snappy? ( !static-libs )"
-
-# https://github.com/google/leveldb/issues/234
-# https://github.com/google/leveldb/issues/236
-PATCHES=( "${FILESDIR}"/{${PN}-1.18-configure.patch,${P}-memenv-so.patch} )
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-
-	TARGET_OS=Linux \
-	USE_SNAPPY=$(usex snappy) \
-	USE_TCMALLOC=no \
-	TMPDIR=${T} \
-	sh -x ./build_detect_platform build_config.mk ./ || die
-}
-
-src_compile() {
-	default
-	usex static-libs && emake out-static/lib{leveldb,memenv}.a
-	use test && emake static_programs
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/.
-	# This matches the path Debian picked. Upstream provides no guidance.
-	insinto /usr/include/leveldb/helpers
-	doins helpers/memenv/memenv.h
-
-	dolib.so out-shared/libleveldb*$(get_libname)*
-	use static-libs && dolib.a out-static/lib{leveldb,memenv}.a
-	dolib.so out-shared/libmemenv*$(get_libname)*
-}

diff --git a/dev-libs/leveldb/leveldb-1.23-r1.ebuild b/dev-libs/leveldb/leveldb-1.23-r1.ebuild
deleted file mode 100644
index 498da29525eb..000000000000
--- a/dev-libs/leveldb/leveldb-1.23-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+crc32c +snappy +tcmalloc test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="crc32c? ( dev-libs/crc32c )
-	snappy? ( app-arch/snappy )
-	tcmalloc? ( dev-util/google-perftools )"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.23-system-testdeps.patch
-	"${FILESDIR}"/${PN}-1.23-remove-benchmark-dep.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DLEVELDB_BUILD_BENCHMARKS=OFF
-		-DLEVELDB_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/leveldb/files/, dev-libs/leveldb/
@ 2022-02-04 20:49 Arthur Zamarin
  0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2022-02-04 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     00fc32dea248405068c7bef23904ef8d3e10655d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 20:47:54 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 20:49:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00fc32de

dev-libs/leveldb: Revert drop 1.20

Reverts: 5d0bd6ede5c8f6107be8c62ea98ec9aafe79c58a
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-libs/leveldb/Manifest                          |  1 +
 .../leveldb/files/leveldb-1.18-configure.patch     | 52 ++++++++++++++++++
 .../leveldb/files/leveldb-1.20-memenv-so.patch     | 33 +++++++++++
 dev-libs/leveldb/leveldb-1.20.ebuild               | 64 ++++++++++++++++++++++
 4 files changed, 150 insertions(+)

diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 02ce0049311b..26c4a7fc073c 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1 +1,2 @@
+DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
 DIST leveldb-1.23.tar.gz 242925 BLAKE2B ef9ac853cdc2f376b9b4299c1017db8c262cb318ad771f40fe81c9fb71ea06ee56ac533b3e8af4e6fdd28577a2f87cfd103ecb49098187d099ccd6019b8ca1d2 SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84

diff --git a/dev-libs/leveldb/files/leveldb-1.18-configure.patch b/dev-libs/leveldb/files/leveldb-1.18-configure.patch
new file mode 100644
index 000000000000..ba30fc731ad5
--- /dev/null
+++ b/dev-libs/leveldb/files/leveldb-1.18-configure.patch
@@ -0,0 +1,52 @@
+we'll handle configure ourselves in src_configure
+
+--- a/Makefile
++++ b/Makefile
+@@ -14,9 +14,6 @@ OPT ?= -O2 -DNDEBUG
+ # OPT ?= -O2 -g2 -DNDEBUG
+ #-----------------------------------------------
+ 
+-# detect what platform we're building on
+-$(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \
+-    ./build_detect_platform build_config.mk ./)
+ # this file is generated by the previous line to set build flags and sources
+ include build_config.mk
+ 
+
+control snappy/tcmalloc explicitly
+
+--- a/build_detect_platform
++++ a/build_detect_platform
+@@ -190,6 +190,7 @@
+         COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
+     fi
+ 
++if [ "${USE_SNAPPY:-auto}" = "auto" ]; then
+     # Test whether Snappy library is installed
+     # http://code.google.com/p/snappy/
+     $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null  <<EOF
+@@ -197,15 +198,24 @@
+       int main() {}
+ EOF
+     if [ "$?" = 0 ]; then
++        USE_SNAPPY="yes"
++    fi
++fi
++    if [ "$USE_SNAPPY" = "yes" ]; then
+         COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
+         PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
+     fi
+ 
++if [ "${USE_TCMALLOC:-auto}" = "auto" ]; then
+     # Test whether tcmalloc is available
+     $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null  <<EOF
+       int main() {}
+ EOF
+     if [ "$?" = 0 ]; then
++        USE_TCMALLOC="yes"
++    fi
++fi
++    if [ "$USE_TCMALLOC" = "yes" ]; then
+         PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
+     fi
+ 

diff --git a/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch b/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch
new file mode 100644
index 000000000000..d443ef0ad262
--- /dev/null
+++ b/dev-libs/leveldb/files/leveldb-1.20-memenv-so.patch
@@ -0,0 +1,33 @@
+# Create libmemenv.so and don't compile programs by default
+# Add a static_programs target to compile test programs
+--- a/Makefile	2018-06-03 16:52:28.839614213 +0200
++++ b/Makefile	2018-06-03 16:52:18.209544310 +0200
+@@ -128,15 +128,27 @@
+ 	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1)
+ $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3)
+ 	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2)
++SHARED_MEMENV_LIB1 = libmemenv.$(PLATFORM_SHARED_EXT)
++SHARED_MEMENV_LIB2 = $(SHARED_MEMENV_LIB1).$(SHARED_VERSION_MAJOR)
++SHARED_MEMENV_LIB3 = $(SHARED_MEMENV_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
++SHARED_MEMENV_LIBS = $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3)
++$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1): $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3)
++	ln -fs $(SHARED_MEMENV_LIB3) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB1)
++$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2): $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3)
++	ln -fs $(SHARED_MEMENV_LIB3) $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB2)
+ SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a
+ endif
+ 
+ $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
+ 	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_LIB2) $(SHARED_LIBOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_LIB3) $(LIBS)
++$(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3): $(SHARED_MEMENVOBJECTS)
++	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_MEMENV_LIB2) $(SHARED_MEMENVOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_MEMENV_LIB3) $(LIBS)
+ 
+ endif  # PLATFORM_SHARED_EXT
+ 
+-all: $(SHARED_LIBS) $(SHARED_PROGRAMS) $(STATIC_OUTDIR)/libleveldb.a $(STATIC_OUTDIR)/libmemenv.a $(STATIC_PROGRAMS)
++all: $(SHARED_LIBS) $(SHARED_MEMENV_LIBS)
++
++static_programs: $(STATIC_PROGRAMS)
+ 
+ check: $(STATIC_PROGRAMS)
+ 	for t in $(notdir $(TESTS)); do echo "***** Running $$t"; $(STATIC_OUTDIR)/$$t || exit 1; done

diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
new file mode 100644
index 000000000000..6961f094c8cc
--- /dev/null
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="a fast key-value storage library written at Google"
+HOMEPAGE="https://github.com/google/leveldb"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+# https://github.com/google/leveldb/issues/536
+SLOT="0/1"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+snappy static-libs +tcmalloc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="tcmalloc? ( dev-util/google-perftools )
+	snappy? (
+		app-arch/snappy:=
+	)"
+RDEPEND="${DEPEND}"
+
+# https://bugs.gentoo.org/651604
+REQUIRED_USE="snappy? ( !static-libs )"
+
+# https://github.com/google/leveldb/issues/234
+# https://github.com/google/leveldb/issues/236
+PATCHES=( "${FILESDIR}"/{${PN}-1.18-configure.patch,${P}-memenv-so.patch} )
+
+src_configure() {
+	# These vars all get picked up by build_detect_platform
+	tc-export AR CC CXX
+	export OPT="-DNDEBUG ${CPPFLAGS}"
+
+	TARGET_OS=Linux \
+	USE_SNAPPY=$(usex snappy) \
+	USE_TCMALLOC=no \
+	TMPDIR=${T} \
+	sh -x ./build_detect_platform build_config.mk ./ || die
+}
+
+src_compile() {
+	default
+	usex static-libs && emake out-static/lib{leveldb,memenv}.a
+	use test && emake static_programs
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/include
+	doins -r include/.
+	# This matches the path Debian picked. Upstream provides no guidance.
+	insinto /usr/include/leveldb/helpers
+	doins helpers/memenv/memenv.h
+
+	dolib.so out-shared/libleveldb*$(get_libname)*
+	use static-libs && dolib.a out-static/lib{leveldb,memenv}.a
+	dolib.so out-shared/libmemenv*$(get_libname)*
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-02-04 20:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-13 15:20 [gentoo-commits] repo/gentoo:master commit in: dev-libs/leveldb/files/, dev-libs/leveldb/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2022-02-04 20:49 Arthur Zamarin
2022-02-04 20:16 Arthur Zamarin
2021-04-25 18:06 Andreas Sturmlechner

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