package/rocksdb: bump to version 6.13.3
PATCH 1/1 package/rocksdb: bump to version 6.13.3
- Refresh first patch
- Replace second patch (this new iteration of previous patch has not been merged and does not apply cleanly on current version)
- Update hash of README.md (CircleCI gadget added with
https://github.com/facebook/rocksdb/commit/63b59f21d9971fc941e3ee2244783a3c16bd5ad4)
- LTO is supported since version 6.12.6 and
https://github.com/facebook/rocksdb/commit/c0c33a4854587e412742841f199edd4616be6c00
- DESTDIR and PREFIX are supported since version 6.13.2 and
https://github.com/facebook/rocksdb/commit/1e59800718b29d4a762b8ac356767a701f968a4d
https://github.com/facebook/rocksdb/releases/tag/v6.13.3
Fixes:
- http://autobuild.buildroot.org/results/a9798bb279a668a266c472fb026b68dbccf50431
--- ...ls-build_detect_platform-fix-C-tests.patch | 67 +- ...patiblity-fix-CRC32-C-implementation.patch | 3787 +++++++++++++++ ...e-POWER-crc32c-with-C-implementation.patch | 4058 ----------------- package/rocksdb/rocksdb.hash | 4 +- package/rocksdb/rocksdb.mk | 16 +- 5 files changed, 3857 insertions(+), 4075 deletions(-) create mode 100644 package/rocksdb/0002-POWER7-8-compatiblity-fix-CRC32-C-implementation.patch delete mode 100644 package/rocksdb/0002-replace-POWER-crc32c-with-C-implementation.patch
package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch +56 -11
@@ -16,13 +16,22 @@ EOF Signed-off-by: Fabrice Fontaine <[email protected]> [Upstream status: https://github.com/facebook/rocksdb/pull/6479] --- - build_tools/build_detect_platform | 58 +++++++++++++++---------------- - 1 file changed, 29 insertions(+), 29 deletions(-) + build_tools/build_detect_platform | 66 +++++++++++++++---------------- + 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform index 2535d8124..64a0ae76c 100755 --- a/build_tools/build_detect_platform +++ b/build_tools/build_detect_platform +@@ -172,7 +172,7 @@ case "$TARGET_OS" in + PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lpthread -lrt -ldl" + if test $ROCKSDB_USE_IO_URING; then + # check for liburing +- $CXX $CFLAGS -x c++ - -luring -o /dev/null 2>/dev/null <<EOF ++ $CXX $CFLAGS -x c++ - -luring -o test.o 2>/dev/null <<EOF + #include <liburing.h> + int main() { + struct io_uring ring; @@ -245,7 +245,7 @@ if [ "$CROSS_COMPILE" = "true" -o "$FBCODE_BUILD" = "true" ]; then else if ! test $ROCKSDB_DISABLE_FALLOCATE; then
@@ -45,17 +54,26 @@ index 2535d8124..64a0ae76c 100755 # Test whether gflags library is installed # http://gflags.github.io/gflags/ # check if the namespace is gflags -- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF -+ $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF +- if $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF ++ if $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF #include <gflags/gflags.h> + using namespace GFLAGS_NAMESPACE; int main() {} - EOF +@@ -323,7 +323,7 @@ EOF + COMMON_FLAGS="$COMMON_FLAGS -DGFLAGS=1" + PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags" + # check if namespace is gflags +- elif $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF ++ elif $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF + #include <gflags/gflags.h> + using namespace gflags; + int main() {} @@ -285,7 +285,7 @@ EOF - PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags" - else - # check if namespace is google -- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF -+ $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF + COMMON_FLAGS="$COMMON_FLAGS -DGFLAGS=1 -DGFLAGS_NAMESPACE=gflags" + PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags" + # check if namespace is google +- elif $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF ++ elif $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF #include <gflags/gflags.h> using namespace google; int main() {}
@@ -142,6 +160,15 @@ index 2535d8124..64a0ae76c 100755 size_t res = malloc_usable_size(0); @@ -424,7 +424,7 @@ EOF + if ! test $ROCKSDB_DISABLE_MEMKIND; then + # Test whether memkind library is installed +- $CXX $CFLAGS $COMMON_FLAGS -lmemkind -x c++ - -o /dev/null 2>/dev/null <<EOF ++ $CXX $CFLAGS $COMMON_FLAGS -lmemkind -x c++ - -o test.o 2>/dev/null <<EOF + #include <memkind.h> + int main() { + memkind_malloc(MEMKIND_DAX_KMEM, 1024); +@@ -486,7 +486,7 @@ EOF + if ! test $ROCKSDB_DISABLE_PTHREAD_MUTEX_ADAPTIVE_NP; then # Test whether PTHREAD_MUTEX_ADAPTIVE_NP mutex type is available - $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null <<EOF
@@ -222,7 +249,7 @@ index 2535d8124..64a0ae76c 100755 EOF if [ "$?" = 0 ]; then @@ -603,7 +603,7 @@ if test "$TRY_SSE_ETC"; then - TRY_AVX2="-mavx2" + TRY_LZCNT="-mlzcnt" fi -$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_SSE42 -x c++ - -o /dev/null 2>/dev/null <<EOF
@@ -252,6 +279,24 @@ index 2535d8124..64a0ae76c 100755 echo "warning: USE_SSE specified but compiler could not use AVX2 intrinsics, disabling" >&2 fi +-$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_BMI -x c++ - -o /dev/null 2>/dev/null <<EOF ++$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_BMI -x c++ - -o test.o 2>/dev/null <<EOF + #include <cstdint> + #include <immintrin.h> + int main(int argc, char *argv[]) { +@@ -739,7 +739,7 @@ elif test "$USE_SSE"; then + echo "warning: USE_SSE specified but compiler could not use BMI intrinsics, disabling" >&2 + fi + +-$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_LZCNT -x c++ - -o /dev/null 2>/dev/null <<EOF ++$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_LZCNT -x c++ - -o test.o 2>/dev/null <<EOF + #include <cstdint> + #include <immintrin.h> + int main(int argc, char *argv[]) { +@@ -753,7 +753,7 @@ elif test "$USE_SSE"; then + echo "warning: USE_SSE specified but compiler could not use LZCNT intrinsics, disabling" >&2 + fi + -$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null <<EOF +$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS -x c++ - -o test.o 2>/dev/null <<EOF #include <cstdint>
package/rocksdb/0002-POWER7-8-compatiblity-fix-CRC32-C-implementation.patch new file +3787 -0
2,895 lines not on this page · raw message
package/rocksdb/0002-replace-POWER-crc32c-with-C-implementation.patch deleted +0 -4058
4,058 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.28.0
Part of the diff is not shown here. View the raw message.
Thomas Petazzoni
AppliedPATCH 1/1 package/rocksdb: bump to version 6.13.3
Quoted 16 lines · On Thu, 5 Nov 2020 20:59:05 +0100 Fabrice Fontaine…
- Refresh first patch
- Replace second patch (this new iteration of previous patch has not been merged and does not apply cleanly on current version)
- Update hash of README.md (CircleCI gadget added with
https://github.com/facebook/rocksdb/commit/63b59f21d9971fc941e3ee2244783a3c16bd5ad4)
- LTO is supported since version 6.12.6 and
https://github.com/facebook/rocksdb/commit/c0c33a4854587e412742841f199edd4616be6c00
- DESTDIR and PREFIX are supported since version 6.13.2 and
https://github.com/facebook/rocksdb/commit/1e59800718b29d4a762b8ac356767a701f968a4dhttps://github.com/facebook/rocksdb/releases/tag/v6.13.3
Fixes:
- http://autobuild.buildroot.org/results/a9798bb279a668a266c472fb026b68dbccf50431Signed-off-by Fabrice Fontaine <[email protected]>
Quoted 9 lines
--- ...ls-build_detect_platform-fix-C-tests.patch | 67 +- ...patiblity-fix-CRC32-C-implementation.patch | 3787 +++++++++++++++ ...e-POWER-crc32c-with-C-implementation.patch | 4058 ----------------- package/rocksdb/rocksdb.hash | 4 +- package/rocksdb/rocksdb.mk | 16 +- 5 files changed, 3857 insertions(+), 4075 deletions(-) create mode 100644 package/rocksdb/0002-POWER7-8-compatiblity-fix-CRC32-C-implementation.patch delete mode 100644 package/rocksdb/0002-replace-POWER-crc32c-with-C-implementation.patch
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com