From 2b9299b95386ae83d56d9f9e6567b22befc8da9b Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 25 Feb 2022 09:12:42 +0100 Subject: [PATCH] leveldb: bump version --- ...eveldb-1.22.recipe => leveldb-1.23.recipe} | 8 +++- .../leveldb/patches/leveldb-1.23.patchset | 45 +++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) rename dev-libs/leveldb/{leveldb-1.22.recipe => leveldb-1.23.recipe} (88%) create mode 100644 dev-libs/leveldb/patches/leveldb-1.23.patchset diff --git a/dev-libs/leveldb/leveldb-1.22.recipe b/dev-libs/leveldb/leveldb-1.23.recipe similarity index 88% rename from dev-libs/leveldb/leveldb-1.22.recipe rename to dev-libs/leveldb/leveldb-1.23.recipe index fe0e96671..d42a19c46 100644 --- a/dev-libs/leveldb/leveldb-1.22.recipe +++ b/dev-libs/leveldb/leveldb-1.23.recipe @@ -12,10 +12,11 @@ COPYRIGHT="2017 The LevelDB Authors" LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://github.com/google/leveldb/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2" +CHECKSUM_SHA256="9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76" SOURCE_FILENAME="leveldb-$portVersion.tar.gz" +PATCHES="leveldb-$portVersion.patchset" -ARCHITECTURES="all !x86_gcc2 ?x86" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" libVersion="${portVersion}.0" @@ -28,6 +29,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libsnappy$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " PROVIDES_devel=" @@ -41,6 +43,8 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libbenchmark$secondaryArchSuffix + devel:libgmock$secondaryArchSuffix devel:libsnappy$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/dev-libs/leveldb/patches/leveldb-1.23.patchset b/dev-libs/leveldb/patches/leveldb-1.23.patchset new file mode 100644 index 000000000..a23323f19 --- /dev/null +++ b/dev-libs/leveldb/patches/leveldb-1.23.patchset @@ -0,0 +1,45 @@ +From d0c00ec60af4826c49a571a86ffdd9646698a33b Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 25 Feb 2022 09:03:57 +0100 +Subject: unbundle gtest and benchmark + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f8285b8..352ba35 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -296,20 +296,12 @@ if(LEVELDB_BUILD_TESTS) + set(build_gmock ON) + + # This project is tested using GoogleTest. +- add_subdirectory("third_party/googletest") ++ find_package(GTest) + + # This project uses Google benchmark for benchmarking. + set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE) + set(BENCHMARK_ENABLE_EXCEPTIONS OFF CACHE BOOL "" FORCE) +- add_subdirectory("third_party/benchmark") +- +- # GoogleTest triggers a missing field initializers warning. +- if(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- set_property(TARGET gtest +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- set_property(TARGET gmock +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- endif(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS) ++ find_package(benchmark) + + function(leveldb_test test_file) + get_filename_component(test_target_name "${test_file}" NAME_WE) +@@ -400,7 +392,7 @@ if(LEVELDB_BUILD_BENCHMARKS) + + "${bench_file}" + ) +- target_link_libraries("${bench_target_name}" leveldb gmock gtest) ++ target_link_libraries("${bench_target_name}" leveldb GTest::gtest) + target_compile_definitions("${bench_target_name}" + PRIVATE + ${LEVELDB_PLATFORM_NAME}=1 +-- +2.30.2 +