aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2020-11-14 00:47:36 +0200
committerAndy Postnikov <apostnikov@gmail.com>2021-04-04 21:52:44 +0300
commit554d171be4716d76d696064d23d1951d9bf6b2e3 (patch)
tree0eb678622b660c7f6019a316f8ba7186ee893ae9
parent359485342ea07b569b92d5e6131923ebe31585ac (diff)
downloadaports-554d171be4716d76d696064d23d1951d9bf6b2e3.tar.gz
aports-554d171be4716d76d696064d23d1951d9bf6b2e3.tar.bz2
aports-554d171be4716d76d696064d23d1951d9bf6b2e3.tar.xz
community/libcouchbase: upgrade to 3.1.0
-rw-r--r--community/libcouchbase/APKBUILD14
-rw-r--r--community/libcouchbase/fix_libdir.patch10
2 files changed, 18 insertions, 6 deletions
diff --git a/community/libcouchbase/APKBUILD b/community/libcouchbase/APKBUILD
index fca3212483..b9b2254433 100644
--- a/community/libcouchbase/APKBUILD
+++ b/community/libcouchbase/APKBUILD
@@ -1,16 +1,17 @@
# Contributor: Nathan Johnson <nathan@nathanjohnson.info>
# Maintainer: Nathan Johnson <nathan@nathanjohnson.info>
pkgname=libcouchbase
-pkgver=2.10.9
+pkgver=3.1.0
pkgrel=0
pkgdesc="C client library for Couchbase"
url="https://developer.couchbase.com/community"
arch="all"
license="Apache-2.0"
depends_dev="musl-dev openssl-dev snappy-dev"
-makedepends="$depends_dev cmake perl libtool libev-dev libevent-dev libuv-dev"
+makedepends="$depends_dev cmake perl libtool libev-dev libevent-dev libuv-dev zlib-dev"
subpackages="$pkgname-dev $pkgname-utils $pkgname-doc $pkgname-libevent $pkgname-libev $pkgname-libuv"
source="$pkgname-$pkgver.tar.gz::https://github.com/couchbase/libcouchbase/archive/$pkgver.tar.gz
+ fix_libdir.patch
fix_socktest.patch"
build() {
@@ -45,7 +46,7 @@ libevent() {
depends="$pkgname libevent"
mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libcouchbase_libevent.so "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/libcouchbase/libcouchbase_libevent.so "$subpkgdir"/usr/lib
}
libev() {
@@ -53,7 +54,7 @@ libev() {
depends="$pkgname libev"
mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libcouchbase_libev.so "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/libcouchbase/libcouchbase_libev.so "$subpkgdir"/usr/lib
}
libuv() {
@@ -61,7 +62,7 @@ libuv() {
depends="$pkgname libuv"
mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/libcouchbase_libuv.so "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/libcouchbase/libcouchbase_libuv.so "$subpkgdir"/usr/lib
}
utils() {
@@ -72,5 +73,6 @@ utils() {
amove usr/bin
}
-sha512sums="a0f7f18fdf9b30af1568d16f40ddfc5bf540ac3bd25f8441eb3a57231ac30a8179e1de3792a3d2eddd2193d447395c375051a6816c83ac0e86d0871900e0a856 libcouchbase-2.10.9.tar.gz
+sha512sums="a321685c387f98e09ef587623bf5c84af2840791c9f8eecb474f70b0b92d57af8fbc4199d67e0b30a05ce4a8300d5be80130b7818e8b14d1b932c2c43ad7eb1e libcouchbase-3.1.0.tar.gz
+270123c57e6e760721ad337db154b8d90bddb81e38c644b854a36e2383fe95f3214227943e7040aa409d5d5ab101681369000054e4738c2a2d1facd0eee923e3 fix_libdir.patch
72319b86fdd91728723ccb091e72199788a84e2ec9ea12c0fcd1ed686eb155ec11e0addbff96735f83e7f31764a85650f0483b6e76d3a8bee16f71b2751fe4a9 fix_socktest.patch"
diff --git a/community/libcouchbase/fix_libdir.patch b/community/libcouchbase/fix_libdir.patch
new file mode 100644
index 0000000000..a8299495ea
--- /dev/null
+++ b/community/libcouchbase/fix_libdir.patch
@@ -0,0 +1,10 @@
+--- a/cmake/configure
++++ b/cmake/configure
+@@ -234,6 +234,7 @@
+ if ($PREFIX) {
+ push @CM_OPTIONS, "-DCMAKE_INSTALL_PREFIX=$PREFIX";
+ }
++push @CM_OPTIONS, "-DCMAKE_INSTALL_LIBDIR=lib";
+ if ($NO_TESTS) {
+ push @CM_OPTIONS, "-DLCB_NO_TESTS=1";
+ }