summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2019-07-12 14:22:16 +0200
committerJan Cholasta2019-07-12 14:22:16 +0200
commit8f50a4dad62f7d020d3847b575d4929e89167bf9 (patch)
tree80ae1aad565b322273b06e04ba8bc3705353b531
parentca4539aca32dcd834fe4305a17c3e2d63bbae60d (diff)
downloadaur-8f50a4dad62f7d020d3847b575d4929e89167bf9.tar.gz
Update to 3.15
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD10
2 files changed, 7 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 647fadf2321e..0405e56df2b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lxd
pkgdesc = REST API, command line tool and OpenStack integration plugin for LXC.
- pkgver = 3.13
+ pkgver = 3.15
pkgrel = 1
url = https://github.com/lxc/lxd
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index e82d9fa20e26..72a83ad9fd31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=lxd
_pkgname=lxd
-pkgver=3.13
+pkgver=3.15
pkgrel=1
pkgdesc="REST API, command line tool and OpenStack integration plugin for LXC."
arch=('x86_64')
@@ -60,9 +60,9 @@ build() {
cd "${GOPATH}/src/${_lxd}"
git checkout lxd-${pkgver}
make deps
- export CGO_CFLAGS="-I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/"
- export CGO_LDFLAGS="-L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/"
- export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/"
+ export CGO_CFLAGS="-I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/libco/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/dqlite/include/"
+ export CGO_LDFLAGS="-L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/libco/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/dqlite/.libs/"
+ export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/libco/:${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/"
make
}
@@ -78,6 +78,8 @@ package() {
patchelf --set-rpath "/usr/lib/lxd" "${pkgdir}/usr/bin/lxd"
cp --no-dereference --preserve=timestamps \
"${go_deps_dir}/sqlite/.libs/"libsqlite3.so* \
+ "${go_deps_dir}/libco/libco.so" \
+ "${go_deps_dir}/raft/.libs/"libraft.so* \
"${go_deps_dir}/dqlite/.libs/"libdqlite.so* \
"${pkgdir}/usr/lib/lxd"
patchelf --set-rpath "/usr/lib/lxd" "${pkgdir}/usr/lib/lxd/libdqlite.so"