summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2020-01-01 22:16:20 +0100
committerAaron Bauman <bman@gentoo.org>2020-01-01 18:07:29 -0500
commitb4deeb4c3d6a2971730b177bd0276a4bec095aeb (patch)
treede9d127bf20c649362c5d0056757b5d892905be9 /dev-libs/leveldb
parentdev-db/redis: arm64 stable (bug #698436) (diff)
downloadgentoo-b4deeb4c3d6a2971730b177bd0276a4bec095aeb.tar.gz
gentoo-b4deeb4c3d6a2971730b177bd0276a4bec095aeb.tar.bz2
gentoo-b4deeb4c3d6a2971730b177bd0276a4bec095aeb.zip
dev-libs/leveldb: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14208 Signed-off-by: Aaron Bauman <bman@gentoo.org>
Diffstat (limited to 'dev-libs/leveldb')
-rw-r--r--dev-libs/leveldb/files/leveldb-1.9.0-configure.patch35
-rw-r--r--dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch81
2 files changed, 0 insertions, 116 deletions
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch b/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch
deleted file mode 100644
index d25fe01f6835..000000000000
--- a/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/build_detect_platform b/build_detect_platform
-index 5801d20..4b4bb0d 100755
---- a/build_detect_platform
-+++ b/build_detect_platform
-@@ -169,20 +169,30 @@ EOF
-
- # Test whether Snappy library is installed
- # http://code.google.com/p/snappy/
-+if [ "${USE_SNAPPY:-auto}" = "auto" ]; then
- $CXX $CXXFLAGS -x c++ - -o /dev/null 2>/dev/null <<EOF
- #include <snappy.h>
- 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
-
- # Test whether tcmalloc is available
-+if [ "${USE_TCMALLOC:-auto}" = "auto" ]; then
- $CXX $CXXFLAGS -x c++ - -o /dev/null -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
- fi
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch b/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch
deleted file mode 100644
index 1c21dbe09ff5..000000000000
--- a/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur leveldb-1.9.0.orig/db/db_test.cc leveldb-1.9.0/db/db_test.cc
---- leveldb-1.9.0.orig/db/db_test.cc 2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/db_test.cc 2014-03-28 22:58:59.000000000 +0000
-@@ -139,7 +139,7 @@
-
- Status s = target()->NewWritableFile(f, r);
- if (s.ok()) {
-- if (strstr(f.c_str(), ".sst") != NULL) {
-+ if (strstr(f.c_str(), ".sst") != NULL || strstr(f.c_str(), ".ldb") != NULL) {
- *r = new SSTableFile(this, *r);
- } else if (strstr(f.c_str(), "MANIFEST") != NULL) {
- *r = new ManifestFile(this, *r);
-diff -ur leveldb-1.9.0.orig/db/filename.cc leveldb-1.9.0/db/filename.cc
---- leveldb-1.9.0.orig/db/filename.cc 2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/filename.cc 2014-03-28 23:07:48.000000000 +0000
-@@ -34,6 +34,11 @@
- return MakeFileName(name, number, "sst");
- }
-
-+std::string LDBTableFileName(const std::string& name, uint64_t number) {
-+ assert(number > 0);
-+ return MakeFileName(name, number, "ldb");
-+}
-+
- std::string DescriptorFileName(const std::string& dbname, uint64_t number) {
- assert(number > 0);
- char buf[100];
-@@ -106,7 +111,7 @@
- Slice suffix = rest;
- if (suffix == Slice(".log")) {
- *type = kLogFile;
-- } else if (suffix == Slice(".sst")) {
-+ } else if (suffix == Slice(".sst") || suffix == Slice(".ldb")) {
- *type = kTableFile;
- } else if (suffix == Slice(".dbtmp")) {
- *type = kTempFile;
-diff -ur leveldb-1.9.0.orig/db/filename.h leveldb-1.9.0/db/filename.h
---- leveldb-1.9.0.orig/db/filename.h 2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/filename.h 2014-03-28 23:07:43.000000000 +0000
-@@ -36,6 +36,7 @@
- // in the db named by "dbname". The result will be prefixed with
- // "dbname".
- extern std::string TableFileName(const std::string& dbname, uint64_t number);
-+extern std::string LDBTableFileName(const std::string& dbname, uint64_t number);
-
- // Return the name of the descriptor file for the db named by
- // "dbname" and the specified incarnation number. The result will be
-diff -ur leveldb-1.9.0.orig/db/repair.cc leveldb-1.9.0/db/repair.cc
---- leveldb-1.9.0.orig/db/repair.cc 2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/repair.cc 2014-03-28 23:13:28.000000000 +0000
-@@ -263,6 +263,14 @@
- std::string fname = TableFileName(dbname_, t->meta.number);
- int counter = 0;
- Status status = env_->GetFileSize(fname, &t->meta.file_size);
-+ if (!status.ok()) {
-+ // Try alternate file name.
-+ fname = LDBTableFileName(dbname_, t->meta.number);
-+ Status s2 = env_->GetFileSize(fname, &t->meta.file_size);
-+ if (s2.ok()) {
-+ status = Status::OK();
-+ }
-+ }
- if (status.ok()) {
- Iterator* iter = table_cache_->NewIterator(
- ReadOptions(), t->meta.number, t->meta.file_size);
-diff -ur leveldb-1.9.0.orig/db/table_cache.cc leveldb-1.9.0/db/table_cache.cc
---- leveldb-1.9.0.orig/db/table_cache.cc 2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/table_cache.cc 2014-03-28 23:12:39.000000000 +0000
-@@ -54,6 +54,12 @@
- RandomAccessFile* file = NULL;
- Table* table = NULL;
- s = env_->NewRandomAccessFile(fname, &file);
-+ if (!s.ok()) {
-+ std::string ldb_fname = LDBTableFileName(dbname_, file_number);
-+ if (env_->NewRandomAccessFile(ldb_fname, &file).ok()) {
-+ s = Status::OK();
-+ }
-+ }
- if (s.ok()) {
- s = Table::Open(*options_, file, file_size, &table);
- }