Date: Wednesday, March 17, 2021 @ 15:27:58 Author: arojas Revision: 893410
archrelease: copy trunk to community-x86_64 Added: leveldb/repos/community-x86_64/PKGBUILD (from rev 893409, leveldb/trunk/PKGBUILD) leveldb/repos/community-x86_64/leveldb-unbundle-gtest-benchmark.patch (from rev 893409, leveldb/trunk/leveldb-unbundle-gtest-benchmark.patch) Deleted: leveldb/repos/community-x86_64/PKGBUILD leveldb/repos/community-x86_64/leveldb-unbundle-gtest-benchmark.patch ----------------------------------------+ PKGBUILD | 85 +++++++++++++++---------------- leveldb-unbundle-gtest-benchmark.patch | 72 +++++++++++++------------- 2 files changed, 79 insertions(+), 78 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-03-17 15:27:47 UTC (rev 893409) +++ PKGBUILD 2021-03-17 15:27:58 UTC (rev 893410) @@ -1,42 +0,0 @@ -# Maintainer: Dave Reisner <dreis...@archlinux.org> -# Contributor: feydaykyn <feyday...@yahoo.fr> - -pkgname=leveldb -pkgver=1.23 -pkgrel=1 -pkgdesc="A fast and lightweight key/value database library" -arch=('x86_64') -url="https://github.com/google/leveldb" -license=('BSD') -depends=('gperftools' 'snappy') -makedepends=('cmake' 'gmock' 'benchmark') -source=("$pkgname-$pkgver.tar.gz::https://github.com/google/leveldb/archive/$pkgver.tar.gz" - leveldb-unbundle-gtest-benchmark.patch) -sha256sums=('9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76' - '4183dc3b5c17a0cb5fb66ada179b9bd2b43e997d3a9c854d19cf892ea6e524b9') - -prepare() { - patch -d $pkgname-$pkgver -p1 < leveldb-unbundle-gtest-benchmark.patch # Unbundle GTest and benchmark -} - -build() { - cmake -B build -S $pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=1 - cmake --build build -} - -check() { - cmake --build build --target test -} - -package() { - DESTDIR="$pkgdir" cmake --install build - - # documentation - install -dm755 "$pkgdir"/usr/share/doc/$pkgname - cp -dr --no-preserve=ownership $pkgname-$pkgver/doc/* "$pkgdir"/usr/share/doc/$pkgname - - # license - install -Dm644 $pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname -} Copied: leveldb/repos/community-x86_64/PKGBUILD (from rev 893409, leveldb/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-03-17 15:27:58 UTC (rev 893410) @@ -0,0 +1,43 @@ +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: feydaykyn <feyday...@yahoo.fr> + +pkgname=leveldb +pkgver=1.23 +pkgrel=2 +pkgdesc="A fast and lightweight key/value database library" +arch=('x86_64') +url="https://github.com/google/leveldb" +license=('BSD') +depends=('gperftools' 'snappy') +makedepends=('cmake' 'gmock' 'benchmark') +source=("$pkgname-$pkgver.tar.gz::https://github.com/google/leveldb/archive/$pkgver.tar.gz" + leveldb-unbundle-gtest-benchmark.patch) +sha256sums=('9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76' + '4183dc3b5c17a0cb5fb66ada179b9bd2b43e997d3a9c854d19cf892ea6e524b9') + +prepare() { + patch -d $pkgname-$pkgver -p1 < leveldb-unbundle-gtest-benchmark.patch # Unbundle GTest and benchmark + sed -e '/fno-rtti/d' -i $pkgname-$pkgver/CMakeLists.txt # Don't disable RTTI, needed for ceph +} + +build() { + cmake -B build -S $pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=1 + cmake --build build +} + +check() { + cmake --build build --target test +} + +package() { + DESTDIR="$pkgdir" cmake --install build + + # documentation + install -dm755 "$pkgdir"/usr/share/doc/$pkgname + cp -dr --no-preserve=ownership $pkgname-$pkgver/doc/* "$pkgdir"/usr/share/doc/$pkgname + + # license + install -Dm644 $pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname +} Deleted: leveldb-unbundle-gtest-benchmark.patch =================================================================== --- leveldb-unbundle-gtest-benchmark.patch 2021-03-17 15:27:47 UTC (rev 893409) +++ leveldb-unbundle-gtest-benchmark.patch 2021-03-17 15:27:58 UTC (rev 893410) @@ -1,36 +0,0 @@ -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 Copied: leveldb/repos/community-x86_64/leveldb-unbundle-gtest-benchmark.patch (from rev 893409, leveldb/trunk/leveldb-unbundle-gtest-benchmark.patch) =================================================================== --- leveldb-unbundle-gtest-benchmark.patch (rev 0) +++ leveldb-unbundle-gtest-benchmark.patch 2021-03-17 15:27:58 UTC (rev 893410) @@ -0,0 +1,36 @@ +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