* update snappy to 1.2.1-2
This commit is contained in:
parent
cbe2428c34
commit
a384d12bcf
@ -1,30 +1,30 @@
|
|||||||
pkgbase = snappy
|
pkgbase = snappy
|
||||||
pkgdesc = A fast compressor/decompressor library
|
pkgdesc = A fast compressor/decompressor library
|
||||||
pkgver = 1.1.10
|
pkgver = 1.2.1
|
||||||
pkgrel = 1.1
|
pkgrel = 2
|
||||||
url = https://google.github.io/snappy/
|
url = https://github.com/google/snappy
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
arch = powerpc64le
|
arch = powerpc64le
|
||||||
arch = powerpc64
|
arch = powerpc64
|
||||||
arch = powerpc
|
arch = powerpc
|
||||||
arch = riscv64
|
arch = riscv64
|
||||||
license = BSD
|
license = BSD-3-Clause
|
||||||
checkdepends = zlib
|
checkdepends = zlib
|
||||||
makedepends = cmake
|
|
||||||
makedepends = clang
|
makedepends = clang
|
||||||
|
makedepends = cmake
|
||||||
makedepends = gtest
|
makedepends = gtest
|
||||||
makedepends = benchmark
|
|
||||||
depends = glibc
|
|
||||||
depends = gcc-libs
|
depends = gcc-libs
|
||||||
source = https://github.com/google/snappy/archive/1.1.10/snappy-1.1.10.tar.gz
|
depends = glibc
|
||||||
|
provides = libsnappy.so
|
||||||
|
source = https://github.com/google/snappy/archive/1.2.1/snappy-1.2.1.tar.gz
|
||||||
source = snappy.pc.in
|
source = snappy.pc.in
|
||||||
source = cmake_add_pkgconfig.patch
|
source = cmake_add_pkgconfig.patch
|
||||||
source = system_gtest.patch::https://github.com/google/snappy/commit/114df35e84ad95b6d5afbcf69aa85a14ff029000.patch
|
source = use_system_gtest.patch
|
||||||
source = reenable_rtti.patch::https://github.com/google/snappy/commit/516fdcca6606502e2d562d20c01b225c8d066739.patch
|
source = reenable_rtti.patch::https://github.com/google/snappy/commit/516fdcca6606502e2d562d20c01b225c8d066739.patch
|
||||||
sha256sums = 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
|
sha256sums = 736aeb64d86566d2236ddffa2865ee5d7a82d26c9016b36218fcc27ea4f09f86
|
||||||
sha256sums = 134f06ca0584a1026538d0fb972fc141c008390ecae1806184b721eca1abbc75
|
sha256sums = 134f06ca0584a1026538d0fb972fc141c008390ecae1806184b721eca1abbc75
|
||||||
sha256sums = 2a204d7d35509ffc290d80c641fcb7e8488c67ca550aa1695493cff12c53156b
|
sha256sums = 2a204d7d35509ffc290d80c641fcb7e8488c67ca550aa1695493cff12c53156b
|
||||||
sha256sums = 1bb8a37b377620f6c1adc2bb572ccd0570edbf825da087cd6eda3d24f7acb8eb
|
sha256sums = 50b31b45511e8907f1319305c102f37631b0fbe509f862b612e70073383658e4
|
||||||
sha256sums = bae38a49c9c7c05e7655479559200c3e94d9d6f2b4d6bb46cd22985298f51019
|
sha256sums = 5c9a3be0cabfc58f091a6ba51b05a1627a39693695ab91a6260cecc982e9a6b5
|
||||||
|
|
||||||
pkgname = snappy
|
pkgname = snappy
|
||||||
|
|||||||
3
snappy/.nvchecker.toml
Normal file
3
snappy/.nvchecker.toml
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[snappy]
|
||||||
|
source = "git"
|
||||||
|
git = "https://github.com/google/snappy.git"
|
||||||
@ -1,68 +1,67 @@
|
|||||||
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
|
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
|
||||||
# Maintainer: Dave Reisner <dreisner@archlinux.org>
|
# Maintainer: Anatol Pomozov
|
||||||
|
# Maintainer: Carl Smedstad <carsme@archlinux.org>
|
||||||
|
# Contributor: Dave Reisner <dreisner@archlinux.org>
|
||||||
# Contributor: Antony Male <antony dot male at geemail dot com>>
|
# Contributor: Antony Male <antony dot male at geemail dot com>>
|
||||||
|
|
||||||
pkgname=snappy
|
pkgname=snappy
|
||||||
pkgver=1.1.10
|
pkgver=1.2.1
|
||||||
pkgrel=1.1
|
pkgrel=2
|
||||||
pkgdesc='A fast compressor/decompressor library'
|
pkgdesc='A fast compressor/decompressor library'
|
||||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||||
url="https://google.github.io/snappy/"
|
url="https://github.com/google/snappy"
|
||||||
license=('BSD')
|
license=('BSD-3-Clause')
|
||||||
depends=('glibc' 'gcc-libs')
|
depends=(
|
||||||
|
'gcc-libs'
|
||||||
|
'glibc'
|
||||||
|
)
|
||||||
|
makedepends=(
|
||||||
|
'clang'
|
||||||
|
'cmake'
|
||||||
|
'gtest'
|
||||||
|
)
|
||||||
checkdepends=('zlib')
|
checkdepends=('zlib')
|
||||||
makedepends=('cmake' 'clang' 'gtest' 'benchmark')
|
provides=('libsnappy.so')
|
||||||
source=("https://github.com/google/snappy/archive/$pkgver/$pkgname-$pkgver.tar.gz"
|
source=(
|
||||||
|
"$url/archive/$pkgver/$pkgname-$pkgver.tar.gz"
|
||||||
snappy.pc.in
|
snappy.pc.in
|
||||||
cmake_add_pkgconfig.patch
|
cmake_add_pkgconfig.patch
|
||||||
system_gtest.patch::https://github.com/google/snappy/commit/114df35e84ad95b6d5afbcf69aa85a14ff029000.patch
|
use_system_gtest.patch
|
||||||
reenable_rtti.patch::https://github.com/google/snappy/commit/516fdcca6606502e2d562d20c01b225c8d066739.patch)
|
reenable_rtti.patch::https://github.com/google/snappy/commit/516fdcca6606502e2d562d20c01b225c8d066739.patch
|
||||||
sha256sums=('49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90'
|
)
|
||||||
|
sha256sums=('736aeb64d86566d2236ddffa2865ee5d7a82d26c9016b36218fcc27ea4f09f86'
|
||||||
'134f06ca0584a1026538d0fb972fc141c008390ecae1806184b721eca1abbc75'
|
'134f06ca0584a1026538d0fb972fc141c008390ecae1806184b721eca1abbc75'
|
||||||
'2a204d7d35509ffc290d80c641fcb7e8488c67ca550aa1695493cff12c53156b'
|
'2a204d7d35509ffc290d80c641fcb7e8488c67ca550aa1695493cff12c53156b'
|
||||||
'1bb8a37b377620f6c1adc2bb572ccd0570edbf825da087cd6eda3d24f7acb8eb'
|
'50b31b45511e8907f1319305c102f37631b0fbe509f862b612e70073383658e4'
|
||||||
'bae38a49c9c7c05e7655479559200c3e94d9d6f2b4d6bb46cd22985298f51019')
|
'5c9a3be0cabfc58f091a6ba51b05a1627a39693695ab91a6260cecc982e9a6b5')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd "$pkgname-$pkgver"
|
cd "$pkgname-$pkgver"
|
||||||
cp ../snappy.pc.in .
|
cp ../snappy.pc.in .
|
||||||
patch -p1 < ../cmake_add_pkgconfig.patch # https://bugs.archlinux.org/task/71246
|
patch -Np1 < ../cmake_add_pkgconfig.patch # https://bugs.archlinux.org/task/71246
|
||||||
patch -p1 < ../system_gtest.patch # https://github.com/google/snappy/pull/132
|
patch -Np1 < ../use_system_gtest.patch
|
||||||
patch -p1 < ../reenable_rtti.patch # https://bugs.archlinux.org/task/72058
|
patch -Np1 < ../reenable_rtti.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "$pkgname-$pkgver"
|
cd "$pkgname-$pkgver"
|
||||||
|
cmake -S . -B build \
|
||||||
# compile without assertions
|
-D CMAKE_BUILD_TYPE=None \
|
||||||
CXXFLAGS+=\ -DNDEBUG
|
|
||||||
|
|
||||||
# export CXX=clang++
|
|
||||||
|
|
||||||
cmake \
|
|
||||||
-D CMAKE_INSTALL_PREFIX=/usr \
|
-D CMAKE_INSTALL_PREFIX=/usr \
|
||||||
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
|
-W no-dev \
|
||||||
-DCMAKE_CXX_STANDARD=23 \
|
-DCMAKE_CXX_STANDARD=23 \
|
||||||
-DBUILD_SHARED_LIBS=yes \
|
-DBUILD_SHARED_LIBS=ON \
|
||||||
-DSNAPPY_USE_BUNDLED_GTEST=OFF \
|
-DSNAPPY_BUILD_BENCHMARKS=OFF
|
||||||
-DSNAPPY_USE_BUNDLED_BENCHMARK_LIB=OFF \
|
cmake --build build
|
||||||
.
|
|
||||||
|
|
||||||
make
|
|
||||||
}
|
}
|
||||||
|
|
||||||
check() {
|
check() {
|
||||||
# compile without assertions
|
cd "$pkgname-$pkgver"
|
||||||
CXXFLAGS+=\ -DNDEBUG
|
cmake --build build --target test
|
||||||
|
|
||||||
make -C "$pkgname-$pkgver" test
|
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd "$pkgname-$pkgver"
|
cd "$pkgname-$pkgver"
|
||||||
|
DESTDIR="$pkgdir" cmake --install build
|
||||||
make DESTDIR="$pkgdir" install
|
install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" COPYING
|
||||||
install -m644 -D COPYING "$pkgdir/usr/share/licenses/snappy/LICENSE"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# vim:set ts=2 sw=2 et:
|
|
||||||
|
|||||||
27
snappy/use_system_gtest.patch
Normal file
27
snappy/use_system_gtest.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
diff --unified --recursive --text --new-file snappy-1.2.1.orig/CMakeLists.txt snappy-1.2.1/CMakeLists.txt
|
||||||
|
--- snappy-1.2.1.orig/CMakeLists.txt 2024-09-25 22:35:44.563365640 +0200
|
||||||
|
+++ snappy-1.2.1/CMakeLists.txt 2024-09-25 22:40:22.273395168 +0200
|
||||||
|
@@ -331,19 +331,18 @@
|
||||||
|
set(install_gmock OFF)
|
||||||
|
set(build_gmock ON)
|
||||||
|
|
||||||
|
- # This project is tested using GoogleTest.
|
||||||
|
- add_subdirectory("third_party/googletest")
|
||||||
|
+ find_package(GTest REQUIRED)
|
||||||
|
|
||||||
|
# GoogleTest triggers a missing field initializers warning.
|
||||||
|
if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
|
||||||
|
- set_property(TARGET gtest
|
||||||
|
+ set_property(TARGET GTest::gtest
|
||||||
|
APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
|
||||||
|
- set_property(TARGET gmock
|
||||||
|
+ set_property(TARGET GTest::gmock
|
||||||
|
APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
|
||||||
|
endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
|
||||||
|
|
||||||
|
if(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION)
|
||||||
|
- set_property(TARGET gtest
|
||||||
|
+ set_property(TARGET GTest::gtest
|
||||||
|
APPEND PROPERTY COMPILE_OPTIONS -Wno-implicit-int-float-conversion)
|
||||||
|
endif(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION)
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user