1 |
commit: b4deeb4c3d6a2971730b177bd0276a4bec095aeb |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Jan 1 21:16:20 2020 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 1 23:07:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4deeb4c |
7 |
|
8 |
dev-libs/leveldb: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/14208 |
12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
13 |
|
14 |
.../leveldb/files/leveldb-1.9.0-configure.patch | 35 ---------- |
15 |
.../files/leveldb-1.9.0-forwardcompat.patch | 81 ---------------------- |
16 |
2 files changed, 116 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch b/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch |
19 |
deleted file mode 100644 |
20 |
index d25fe01f683..00000000000 |
21 |
--- a/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch |
22 |
+++ /dev/null |
23 |
@@ -1,35 +0,0 @@ |
24 |
-diff --git a/build_detect_platform b/build_detect_platform |
25 |
-index 5801d20..4b4bb0d 100755 |
26 |
---- a/build_detect_platform |
27 |
-+++ b/build_detect_platform |
28 |
-@@ -169,20 +169,30 @@ EOF |
29 |
- |
30 |
- # Test whether Snappy library is installed |
31 |
- # http://code.google.com/p/snappy/ |
32 |
-+if [ "${USE_SNAPPY:-auto}" = "auto" ]; then |
33 |
- $CXX $CXXFLAGS -x c++ - -o /dev/null 2>/dev/null <<EOF |
34 |
- #include <snappy.h> |
35 |
- int main() {} |
36 |
- EOF |
37 |
- if [ "$?" = 0 ]; then |
38 |
-+ USE_SNAPPY="yes" |
39 |
-+ fi |
40 |
-+fi |
41 |
-+ if [ "$USE_SNAPPY" = "yes" ]; then |
42 |
- COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY" |
43 |
- PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy" |
44 |
- fi |
45 |
- |
46 |
- # Test whether tcmalloc is available |
47 |
-+if [ "${USE_TCMALLOC:-auto}" = "auto" ]; then |
48 |
- $CXX $CXXFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null <<EOF |
49 |
- int main() {} |
50 |
- EOF |
51 |
- if [ "$?" = 0 ]; then |
52 |
-+ USE_TCMALLOC="yes" |
53 |
-+ fi |
54 |
-+fi |
55 |
-+ if [ "$USE_TCMALLOC" = "yes" ]; then |
56 |
- PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc" |
57 |
- fi |
58 |
- fi |
59 |
|
60 |
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch b/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch |
61 |
deleted file mode 100644 |
62 |
index 1c21dbe09ff..00000000000 |
63 |
--- a/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch |
64 |
+++ /dev/null |
65 |
@@ -1,81 +0,0 @@ |
66 |
-diff -ur leveldb-1.9.0.orig/db/db_test.cc leveldb-1.9.0/db/db_test.cc |
67 |
---- leveldb-1.9.0.orig/db/db_test.cc 2013-01-07 21:07:29.000000000 +0000 |
68 |
-+++ leveldb-1.9.0/db/db_test.cc 2014-03-28 22:58:59.000000000 +0000 |
69 |
-@@ -139,7 +139,7 @@ |
70 |
- |
71 |
- Status s = target()->NewWritableFile(f, r); |
72 |
- if (s.ok()) { |
73 |
-- if (strstr(f.c_str(), ".sst") != NULL) { |
74 |
-+ if (strstr(f.c_str(), ".sst") != NULL || strstr(f.c_str(), ".ldb") != NULL) { |
75 |
- *r = new SSTableFile(this, *r); |
76 |
- } else if (strstr(f.c_str(), "MANIFEST") != NULL) { |
77 |
- *r = new ManifestFile(this, *r); |
78 |
-diff -ur leveldb-1.9.0.orig/db/filename.cc leveldb-1.9.0/db/filename.cc |
79 |
---- leveldb-1.9.0.orig/db/filename.cc 2013-01-07 21:07:29.000000000 +0000 |
80 |
-+++ leveldb-1.9.0/db/filename.cc 2014-03-28 23:07:48.000000000 +0000 |
81 |
-@@ -34,6 +34,11 @@ |
82 |
- return MakeFileName(name, number, "sst"); |
83 |
- } |
84 |
- |
85 |
-+std::string LDBTableFileName(const std::string& name, uint64_t number) { |
86 |
-+ assert(number > 0); |
87 |
-+ return MakeFileName(name, number, "ldb"); |
88 |
-+} |
89 |
-+ |
90 |
- std::string DescriptorFileName(const std::string& dbname, uint64_t number) { |
91 |
- assert(number > 0); |
92 |
- char buf[100]; |
93 |
-@@ -106,7 +111,7 @@ |
94 |
- Slice suffix = rest; |
95 |
- if (suffix == Slice(".log")) { |
96 |
- *type = kLogFile; |
97 |
-- } else if (suffix == Slice(".sst")) { |
98 |
-+ } else if (suffix == Slice(".sst") || suffix == Slice(".ldb")) { |
99 |
- *type = kTableFile; |
100 |
- } else if (suffix == Slice(".dbtmp")) { |
101 |
- *type = kTempFile; |
102 |
-diff -ur leveldb-1.9.0.orig/db/filename.h leveldb-1.9.0/db/filename.h |
103 |
---- leveldb-1.9.0.orig/db/filename.h 2013-01-07 21:07:29.000000000 +0000 |
104 |
-+++ leveldb-1.9.0/db/filename.h 2014-03-28 23:07:43.000000000 +0000 |
105 |
-@@ -36,6 +36,7 @@ |
106 |
- // in the db named by "dbname". The result will be prefixed with |
107 |
- // "dbname". |
108 |
- extern std::string TableFileName(const std::string& dbname, uint64_t number); |
109 |
-+extern std::string LDBTableFileName(const std::string& dbname, uint64_t number); |
110 |
- |
111 |
- // Return the name of the descriptor file for the db named by |
112 |
- // "dbname" and the specified incarnation number. The result will be |
113 |
-diff -ur leveldb-1.9.0.orig/db/repair.cc leveldb-1.9.0/db/repair.cc |
114 |
---- leveldb-1.9.0.orig/db/repair.cc 2013-01-07 21:07:29.000000000 +0000 |
115 |
-+++ leveldb-1.9.0/db/repair.cc 2014-03-28 23:13:28.000000000 +0000 |
116 |
-@@ -263,6 +263,14 @@ |
117 |
- std::string fname = TableFileName(dbname_, t->meta.number); |
118 |
- int counter = 0; |
119 |
- Status status = env_->GetFileSize(fname, &t->meta.file_size); |
120 |
-+ if (!status.ok()) { |
121 |
-+ // Try alternate file name. |
122 |
-+ fname = LDBTableFileName(dbname_, t->meta.number); |
123 |
-+ Status s2 = env_->GetFileSize(fname, &t->meta.file_size); |
124 |
-+ if (s2.ok()) { |
125 |
-+ status = Status::OK(); |
126 |
-+ } |
127 |
-+ } |
128 |
- if (status.ok()) { |
129 |
- Iterator* iter = table_cache_->NewIterator( |
130 |
- ReadOptions(), t->meta.number, t->meta.file_size); |
131 |
-diff -ur leveldb-1.9.0.orig/db/table_cache.cc leveldb-1.9.0/db/table_cache.cc |
132 |
---- leveldb-1.9.0.orig/db/table_cache.cc 2013-01-07 21:07:29.000000000 +0000 |
133 |
-+++ leveldb-1.9.0/db/table_cache.cc 2014-03-28 23:12:39.000000000 +0000 |
134 |
-@@ -54,6 +54,12 @@ |
135 |
- RandomAccessFile* file = NULL; |
136 |
- Table* table = NULL; |
137 |
- s = env_->NewRandomAccessFile(fname, &file); |
138 |
-+ if (!s.ok()) { |
139 |
-+ std::string ldb_fname = LDBTableFileName(dbname_, file_number); |
140 |
-+ if (env_->NewRandomAccessFile(ldb_fname, &file).ok()) { |
141 |
-+ s = Status::OK(); |
142 |
-+ } |
143 |
-+ } |
144 |
- if (s.ok()) { |
145 |
- s = Table::Open(*options_, file, file_size, &table); |
146 |
- } |