diff --git a/packages/pika/Makefile.patch b/packages/pika/Makefile.patch index 97155d50b0..08a396bff0 100644 --- a/packages/pika/Makefile.patch +++ b/packages/pika/Makefile.patch @@ -5,10 +5,10 @@ -CXX=g++ -PLATFORM_LDFLAGS= -lpthread -lrt -PLATFORM_CXXFLAGS= -std=c++11 -fno-builtin-memcmp -msse -msse4.2 -+PLATFORM_CXXFLAGS= -std=c++11 -fno-builtin-memcmp $(CPPFLAGS) - PROFILING_FLAGS=-pg - OPT= - LDFLAGS += -Wl,-rpath=$(RPATH) ++PLATFORM_CXXFLAGS= -std=c++17 -fno-builtin-memcmp $(CPPFLAGS) + ROCKSDB_CXXFLAGS= + CC_VERSION_MAJOR := $(shell $(CXX) -dumpversion | cut -d '.' -f1) + ifeq (1,$(shell expr $(CC_VERSION_MAJOR) \> 7)) @@ -27,7 +25,7 @@ # compile with -O2 if debug level is not 2 diff --git a/packages/pika/build.sh b/packages/pika/build.sh index ba71f4988c..294fa3d43b 100644 --- a/packages/pika/build.sh +++ b/packages/pika/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/OpenAtomFoundation/pika TERMUX_PKG_DESCRIPTION="A persistent huge storage service, compatible with the vast majority of Redis interfaces" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.4.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION=3.4.1 TERMUX_PKG_SRCURL=https://github.com/OpenAtomFoundation/pika.git -TERMUX_PKG_DEPENDS="google-glog, libc++, libprotobuf, librocksdb, zlib" +TERMUX_PKG_DEPENDS="google-glog, libc++, libprotobuf, librocksdb" TERMUX_PKG_BUILD_IN_SRC=true # ``` @@ -24,6 +23,7 @@ termux_step_post_get_source() { termux_step_pre_configure() { termux_setup_protobuf + CPPFLAGS+=" -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES" export DISABLE_UPDATE_SB=1 } diff --git a/packages/pika/src-pika_admin.cc.patch b/packages/pika/src-pika_admin.cc.patch index 073d9db776..e199e60804 100644 --- a/packages/pika/src-pika_admin.cc.patch +++ b/packages/pika/src-pika_admin.cc.patch @@ -1,26 +1,29 @@ --- a/src/pika_admin.cc +++ b/src/pika_admin.cc -@@ -822,19 +822,19 @@ +@@ -847,22 +847,22 @@ + getrusage(RUSAGE_CHILDREN, &c_ru); std::stringstream tmp_stream; tmp_stream << "# CPU\r\n"; - tmp_stream << "used_cpu_sys:" << -- setiosflags(std::ios::fixed) << std::setprecision(2) << -+ std::setiosflags(std::ios::fixed) << std::setprecision(2) << - (float)self_ru.ru_stime.tv_sec+(float)self_ru.ru_stime.tv_usec/1000000 << - "\r\n"; - tmp_stream << "used_cpu_user:" << -- setiosflags(std::ios::fixed) << std::setprecision(2) << -+ std::setiosflags(std::ios::fixed) << std::setprecision(2) << - (float)self_ru.ru_utime.tv_sec+(float)self_ru.ru_utime.tv_usec/1000000 << - "\r\n"; - tmp_stream << "used_cpu_sys_children:" << -- setiosflags(std::ios::fixed) << std::setprecision(2) << -+ std::setiosflags(std::ios::fixed) << std::setprecision(2) << - (float)c_ru.ru_stime.tv_sec+(float)c_ru.ru_stime.tv_usec/1000000 << - "\r\n"; - tmp_stream << "used_cpu_user_children:" << -- setiosflags(std::ios::fixed) << std::setprecision(2) << -+ std::setiosflags(std::ios::fixed) << std::setprecision(2) << - (float)c_ru.ru_utime.tv_sec+(float)c_ru.ru_utime.tv_usec/1000000 << - "\r\n"; - info.append(tmp_stream.str()); +- tmp_stream << "used_cpu_sys:" << setiosflags(std::ios::fixed) ++ tmp_stream << "used_cpu_sys:" << std::setiosflags(std::ios::fixed) + << std::setprecision(2) + << (float)self_ru.ru_stime.tv_sec + + (float)self_ru.ru_stime.tv_usec / 1000000 + << "\r\n"; +- tmp_stream << "used_cpu_user:" << setiosflags(std::ios::fixed) ++ tmp_stream << "used_cpu_user:" << std::setiosflags(std::ios::fixed) + << std::setprecision(2) + << (float)self_ru.ru_utime.tv_sec + + (float)self_ru.ru_utime.tv_usec / 1000000 + << "\r\n"; +- tmp_stream << "used_cpu_sys_children:" << setiosflags(std::ios::fixed) ++ tmp_stream << "used_cpu_sys_children:" << std::setiosflags(std::ios::fixed) + << std::setprecision(2) + << (float)c_ru.ru_stime.tv_sec + + (float)c_ru.ru_stime.tv_usec / 1000000 + << "\r\n"; +- tmp_stream << "used_cpu_user_children:" << setiosflags(std::ios::fixed) ++ tmp_stream << "used_cpu_user_children:" << std::setiosflags(std::ios::fixed) + << std::setprecision(2) + << (float)c_ru.ru_utime.tv_sec + + (float)c_ru.ru_utime.tv_usec / 1000000 diff --git a/packages/pika/third-blackwidow-Makefile.patch b/packages/pika/third-blackwidow-Makefile.patch index a21898a705..e6daadb2b4 100644 --- a/packages/pika/third-blackwidow-Makefile.patch +++ b/packages/pika/third-blackwidow-Makefile.patch @@ -5,7 +5,7 @@ -CXX=g++ -LDFLAGS= -lpthread -lrt -CXXFLAGS= -g -std=c++11 -fno-builtin-memcmp -msse -msse4.2 -pipe -fPIC -+CXXFLAGS+= -std=c++11 -fno-builtin-memcmp -pipe -fPIC -fno-rtti $(CPPFLAGS) ++CXXFLAGS+= -std=c++17 -fno-builtin-memcmp -pipe -fPIC -fno-rtti $(CPPFLAGS) PROFILING_FLAGS=-pg ARFLAGS = rs OPT= diff --git a/packages/pika/third-blackwidow-src-db_checkpoint.cc.patch b/packages/pika/third-blackwidow-src-db_checkpoint.cc.patch index e60537f929..ebef41ce8c 100644 --- a/packages/pika/third-blackwidow-src-db_checkpoint.cc.patch +++ b/packages/pika/third-blackwidow-src-db_checkpoint.cc.patch @@ -1,6 +1,6 @@ --- a/third/blackwidow/src/db_checkpoint.cc +++ b/third/blackwidow/src/db_checkpoint.cc -@@ -18,16 +18,29 @@ +@@ -18,16 +18,30 @@ #include #include "rocksdb/db.h" @@ -21,7 +21,8 @@ +extern Status CopyFile(FileSystem* env, const std::string& source, + const std::string& destination, uint64_t size, + bool use_fsync, -+ const std::shared_ptr& io_tracer = nullptr); ++ const std::shared_ptr& io_tracer = nullptr, ++ const Temperature temperature = Temperature::kUnknown); + +extern Status CreateFile(FileSystem* env, const std::string& destination, + const std::string& contents, bool); diff --git a/packages/pika/third-blackwidow-src-options_helper.h.patch b/packages/pika/third-blackwidow-src-options_helper.h.patch new file mode 100644 index 0000000000..8467d2f34a --- /dev/null +++ b/packages/pika/third-blackwidow-src-options_helper.h.patch @@ -0,0 +1,10 @@ +--- a/third/blackwidow/src/options_helper.h ++++ b/third/blackwidow/src/options_helper.h +@@ -37,7 +37,6 @@ + static std::unordered_map mutable_db_options_member_type_info = { + {"max_background_jobs", {offsetof(struct rocksdb::DBOptions, max_background_jobs), MemberType::kInt}}, + {"max_background_compactions", {offsetof(struct rocksdb::DBOptions, max_background_compactions), MemberType::kInt}}, +- {"base_background_compactions", {offsetof(struct rocksdb::DBOptions, base_background_compactions), MemberType::kInt}}, + {"max_open_files", {offsetof(struct rocksdb::DBOptions, max_open_files), MemberType::kInt}}, + {"bytes_per_sync", {offsetof(struct rocksdb::DBOptions, bytes_per_sync), MemberType::kUint64T}}, + {"delayed_write_rate", {offsetof(struct rocksdb::DBOptions, delayed_write_rate), MemberType::kUint64T}}, diff --git a/packages/pika/third-pink-pink-Makefile.patch b/packages/pika/third-pink-pink-Makefile.patch index 40f2fb24b1..f79f660edf 100644 --- a/packages/pika/third-pink-pink-Makefile.patch +++ b/packages/pika/third-pink-pink-Makefile.patch @@ -5,7 +5,7 @@ -CXX=g++ -LDFLAGS= -lpthread -lrt -CXXFLAGS= -g -std=c++11 -fno-builtin-memcmp -msse -msse4.2 -pipe -fPIC -+CXXFLAGS+= -std=c++11 -fno-builtin-memcmp -pipe -fPIC $(CPPFLAGS) ++CXXFLAGS+= -std=c++17 -fno-builtin-memcmp -pipe -fPIC $(CPPFLAGS) PROFILING_FLAGS=-pg ARFLAGS = rs OPT= diff --git a/packages/pika/third-slash-slash-Makefile.patch b/packages/pika/third-slash-slash-Makefile.patch index e7e788c786..85b525ab52 100644 --- a/packages/pika/third-slash-slash-Makefile.patch +++ b/packages/pika/third-slash-slash-Makefile.patch @@ -5,7 +5,7 @@ -CXX=g++ -LDFLAGS= -lpthread -lrt -CXXFLAGS= -g -std=c++11 -fno-builtin-memcmp -msse -msse4.2 -pipe -fPIC -+CXXFLAGS+= -std=c++11 -fno-builtin-memcmp -pipe -fPIC $(CPPFLAGS) ++CXXFLAGS+= -std=c++17 -fno-builtin-memcmp -pipe -fPIC $(CPPFLAGS) PROFILING_FLAGS= -pg ARFLAGS = rs OPT=