From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-libs/leveldb/Manifest | 4 -- 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, 184 deletions(-) delete mode 100644 dev-libs/leveldb/files/leveldb-1.18-mips.patch delete mode 100644 dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch delete mode 100644 dev-libs/leveldb/leveldb-1.18-r2.ebuild (limited to 'dev-libs/leveldb') diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest index 289c3437eab7..787f7632dcaa 100644 --- a/dev-libs/leveldb/Manifest +++ b/dev-libs/leveldb/Manifest @@ -1,9 +1,5 @@ AUX leveldb-1.18-configure.patch 1452 BLAKE2B d67c8a226fe8640a5c19d7e7d8e293d0ef31dd01c4813794640ca7f40be8e0c09a084205a6dc954748b2877d8fac1b419ddc9d2461a894bf9de8e53b48852926 SHA512 86bae8c8d5d722435bedc68333c97f318847c93503368d815157a46ab15ad1795f8a585027dcecb7a94c338d25eeb69f94df87f2da2cd9f5805838f0a29dc08e -AUX leveldb-1.18-mips.patch 1399 BLAKE2B ea9bf52ce2c6482c8a43116c5782b2219af3d8a7eafb39a7d0742695b144f50c5f53e33c85ec562c690b78313146eef7a1edf41eb178bb6b9d8e179d87d72576 SHA512 8d968371007d163cbbb87546cbfe246e399f083bacea415f2d8b68355a5d3363df51f34e9bd29ee558ae475414b3c331b7473ef2d7e432ebfa786d55a08b2e54 AUX leveldb-1.20-memenv-so.patch 1877 BLAKE2B fa75c48f438248ec73765d959bbe746b3b4887d1fbfe1b33287a81a9a3fcb5ffabc5eacc350e214dfc40b78c8df7e6246bbf5a889b5d2fded5101da5a8fb72c0 SHA512 31fd9cafe226ceb83cb9a0b526ef4941e29406a182e366521ba2d78dba9ed3e7f32a088362ff9b751a82e30b12a12acd8f4d38808dde288116170417e4de8200 -AUX leveldb-1.9.0-memenv-so.patch 1957 BLAKE2B b26ddad37bba050ae2626aad164a3e403fc8ff3a050f79b08d11c19aff27d729bbcb51b35489badc4981f6ceee518482b9d8ceb30585dcc28a1a21f86d097413 SHA512 fbd1e43dba18b9dc8717651052323ea71182a758eccc3637f3ab1aade1a5de5b00f6a54ea0a8f34e2b9a91173b72eb23530ae77bc2b1ac0e454e0e2dfffcfd75 -DIST leveldb-1.18.tar.gz 209376 BLAKE2B 08d63fe8aed45d38befd29caddee5a229ff847d254b30be55715793a621e840641d53af47e4fd93286ff0445d6001be26aa00063c075681659f7ceb692184249 SHA512 3d9c55a7bf8692914784ec33c273704ce9978496b071c7b661708f049d0d4ccd51a44441f50c3e536725caeb9896575192f52708a4bb1c0222cecdeec89919a3 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2 -EBUILD leveldb-1.18-r2.ebuild 1866 BLAKE2B a1f89384c07ac4ebc92daea56c8d795fe378275bfc72cbaa8e41ee754176113a936f670b570466fa3824c98eac093e25a8fa1d7c0e6cc6499a3ba5ec499fe8d6 SHA512 8ca2b28ef83e6e08ee85b6d055d6cfc09b4e294c2d68e0c06918a10a009492b5a4bc804e1527fd202cf0adf39a0c0d1e6df2dfbff6b353ca43445ae214909917 EBUILD leveldb-1.20.ebuild 1755 BLAKE2B 0fe19dead939d81398ad0c54874393300221f7b45a1ec24dda1949ff2080d8d6bf5275efa1a51c83c0251b247cf5fcf4328ca26116ae6cd35dd9450411dba8bf SHA512 125ffe35e50299b19f937fdcd5a0876b5e576555b0bed70ed1cb2a29e908ed626a24f4a39ba4173de1cf0db923f9d8359bf068e640e2f9944e66c65229d79492 MISC metadata.xml 400 BLAKE2B 770ed89274db8fd29e68bcc792bd9f593ea0785ff4f1651d85902bb0272cfdff3914ecd98e81dea4160ad085e1e0da6938ebfa801b2b5484cf5edd6666908e24 SHA512 b7284da0474b747738d6da09be217c815ec8b333f2b1f571594531fb77ec15a6cf4564b6053dbab84ceb94f3bcc5d16ed374780852920a7ca823df0ed00be5dc 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 379223d210b6..000000000000 --- 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 -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 , -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 0df587a3f9c9..000000000000 --- 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 0a4ac6bfd31c..000000000000 --- a/dev-libs/leveldb/leveldb-1.18-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils 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)* -} -- cgit v1.2.3