diff options
| -rw-r--r-- | testing/rippled/APKBUILD | 6 | ||||
| -rw-r--r-- | testing/rippled/musl-fixes.patch | 38 |
2 files changed, 3 insertions, 41 deletions
diff --git a/testing/rippled/APKBUILD b/testing/rippled/APKBUILD index 86d2fc6efb..760187f8df 100644 --- a/testing/rippled/APKBUILD +++ b/testing/rippled/APKBUILD @@ -1,7 +1,7 @@ # Contributor: André Klitzing <aklitzing@gmail.com> # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=rippled -pkgver=0.80.2 +pkgver=0.90.1 pkgrel=0 pkgdesc="Blockchain daemon implementing the Ripple Consensus Ledger" url="https://ripple.com/" @@ -34,5 +34,5 @@ package() { install -D -m644 doc/validators-example.txt "${pkgdir}/etc/$pkgname/validators.txt" } -sha512sums="4f4b10567ce349e51cb19e556db10c179a62d979f70051fa8f111ee0536b26af9776ba7ef6629400cdc6d9d8ee69b10b738dab7fb4b5297fa7c71107d8f2de04 rippled-0.80.2.tar.gz -a26b01f8bf541471f96f3865b99923b267611ece093f8cbc4f35f87002c403b6e558e5ac15cc7599e9a5c1486f3070a4f61a880a2a3b874fc2dab5d8a6d8e82e musl-fixes.patch" +sha512sums="30d55142f759c577cef948084663e6911aeb01587246f4cd443c85a50cc85b5abd6519df0ee0fd30ee421f600730e80d921c9d2961828b8f904373f263c3a0df rippled-0.90.1.tar.gz +8e313f63096993b8898c6bbbf81671f01fbad84f29b882fe8f164662b2e1487255a4135e978d8a9d2ee18b64fc90be0440109654f9aeef7d65a940b7dd174d5d musl-fixes.patch" diff --git a/testing/rippled/musl-fixes.patch b/testing/rippled/musl-fixes.patch index 1256781124..7b5710e4ac 100644 --- a/testing/rippled/musl-fixes.patch +++ b/testing/rippled/musl-fixes.patch @@ -22,44 +22,6 @@ index cfa6867..1ce4ec3 100644 #include <functional> #include <type_traits> -diff --git a/src/rocksdb2/port/port_posix.cc b/src/rocksdb2/port/port_posix.cc -index c5ea439..b968571 100644 ---- a/src/rocksdb2/port/port_posix.cc -+++ b/src/rocksdb2/port/port_posix.cc -@@ -29,7 +29,7 @@ static int PthreadCall(const char* label, int result) { - } - - Mutex::Mutex(bool adaptive) { --#ifdef OS_LINUX -+#ifdef ROCKSDB_PTHREAD_ADAPTIVE_MUTEX - if (!adaptive) { - PthreadCall("init mutex", pthread_mutex_init(&mu_, nullptr)); - } else { -@@ -42,9 +42,9 @@ Mutex::Mutex(bool adaptive) { - PthreadCall("destroy mutex attr", - pthread_mutexattr_destroy(&mutex_attr)); - } --#else // ignore adaptive for non-linux platform -+#else - PthreadCall("init mutex", pthread_mutex_init(&mu_, nullptr)); --#endif // OS_LINUX -+#endif // ROCKSDB_PTHREAD_ADAPTIVE_MUTEX - } - - Mutex::~Mutex() { PthreadCall("destroy mutex", pthread_mutex_destroy(&mu_)); } -diff --git a/src/rocksdb2/port/stack_trace.cc b/src/rocksdb2/port/stack_trace.cc -index 76866e6..542100c 100644 ---- a/src/rocksdb2/port/stack_trace.cc -+++ b/src/rocksdb2/port/stack_trace.cc -@@ -8,7 +8,7 @@ - namespace rocksdb { - namespace port { - --#if defined(ROCKSDB_LITE) || !(defined(OS_LINUX) || defined(OS_MACOSX)) -+#if defined(ROCKSDB_LITE) || !(defined(__GLIBC__) || defined(OS_MACOSX)) - - // noop - diff --git a/src/rocksdb2/util/log_buffer.h b/src/rocksdb2/util/log_buffer.h index 2a24bf8..ddaaa2c 100644 --- a/src/rocksdb2/util/log_buffer.h |