diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-libs/leveldb/files | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-libs/leveldb/files')
-rw-r--r-- | dev-libs/leveldb/files/leveldb-1.18-mips.patch | 48 | ||||
-rw-r--r-- | dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch | 60 |
2 files changed, 0 insertions, 108 deletions
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 <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 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) |