summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-05-26 18:23:41 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-05-26 18:23:41 -0500
commit36e31b560eb3b4a6154deecfbf91f27494de21b7 (patch)
tree4bb7caf2558c255e7378a5363ef161eacb866620
parent417fd74367e53ad30548b3ef403e17feb8c84708 (diff)
downloadpackages-36e31b560eb3b4a6154deecfbf91f27494de21b7.tar.gz
packages-36e31b560eb3b4a6154deecfbf91f27494de21b7.tar.bz2
packages-36e31b560eb3b4a6154deecfbf91f27494de21b7.tar.xz
packages-36e31b560eb3b4a6154deecfbf91f27494de21b7.zip
harmony/snappy: bump, fix all the crap
-rw-r--r--harmony/snappy/APKBUILD30
-rw-r--r--harmony/snappy/fix-UnalignedCopy64.patch13
2 files changed, 19 insertions, 24 deletions
diff --git a/harmony/snappy/APKBUILD b/harmony/snappy/APKBUILD
index d8806e2f6..588164d55 100644
--- a/harmony/snappy/APKBUILD
+++ b/harmony/snappy/APKBUILD
@@ -1,29 +1,38 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=snappy
-pkgver=1.1.4
-pkgrel=3
+pkgver=1.1.7
+pkgrel=0
pkgdesc="Fast compression and decompression library"
url="http://google.github.io/snappy/"
arch="all"
-license="BSD"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
-source="https://github.com/google/snappy/releases/download/$pkgver/snappy-$pkgver.tar.gz
- fix-UnalignedCopy64.patch
+license="BSD-3-Clause"
+subpackages="$pkgname-dbg $pkgname-dev"
+source="snappy-$pkgver.tar.gz::https://github.com/google/snappy/archive/$pkgver.tar.gz
"
+[ "$CARCH" = "armhf" ] && options="!check" # does not pass testsuite on armhf
builddir="$srcdir/$pkgname-$pkgver"
build() {
cd "$builddir"
- ./configure --prefix=/usr \
- --disable-static
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ ${CMAKE_CROSSOPTS}
make
}
check() {
cd "$builddir"
- make check
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
@@ -31,5 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4f522f1d541e3f00d82ccaf6dda5c6ede28d4db19c53717003d8057261fe8630516ed6ff2a28615da032e0de9c6200b560ed5fce4f8714df9916d50d6a7c2178 snappy-1.1.4.tar.gz
-a086dbdfe2cb21419b33c2f8a2739224a8e843f2c6a51715100c723b9fbd9aed14bcfa791c20dae785b33ac1d1cf4812ed2c5c5d4058c5b8e56a0e004e9a8c60 fix-UnalignedCopy64.patch"
+sha512sums="32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf snappy-1.1.7.tar.gz"
diff --git a/harmony/snappy/fix-UnalignedCopy64.patch b/harmony/snappy/fix-UnalignedCopy64.patch
deleted file mode 100644
index ea64639a1..000000000
--- a/harmony/snappy/fix-UnalignedCopy64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/snappy.cc b/snappy.cc
-index 4bcea0b..2db94b7 100644
---- a/snappy.cc
-+++ b/snappy.cc
-@@ -89,7 +89,7 @@ size_t MaxCompressedLength(size_t source_len) {
- namespace {
-
- void UnalignedCopy64(const void* src, void* dst) {
-- memcpy(dst, src, 8);
-+ memmove(dst, src, 8);
- }
-
- void UnalignedCopy128(const void* src, void* dst) {