From f4dbcff2ba21af19eb36ed6a2402af5b65cf718a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 28 Jun 2020 19:01:01 +0700 Subject: [PATCH] lxd-lts: update to 4.0.2. Fix: #23278 --- srcpkgs/lxd-lts/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template index 22b17204a31..12a119181f2 100644 --- a/srcpkgs/lxd-lts/template +++ b/srcpkgs/lxd-lts/template @@ -1,6 +1,6 @@ # Template file for 'lxd-lts' pkgname=lxd-lts -version=3.0.3 +version=4.0.2 revision=1 wrksrc="lxd-$version" build_style=go @@ -9,22 +9,24 @@ go_build_tags="libsqlite3" go_package="${go_import_path}/lxd ${go_import_path}/lxc ${go_import_path}/lxd-p2c ${go_import_path}/fuidshift" hostmakedepends="pkg-config" -makedepends="lxc-devel acl-devel dqlite-devel" +makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel" depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables" short_desc="Next generation system container manager (long term support channel)" maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://linuxcontainers.org/lxd" distfiles="https://linuxcontainers.org/downloads/lxd/${wrksrc}.tar.gz" -checksum=55b4ae1844e95ad8c283a22ac6c2f661fddedf17fd39d1fdbe60f07895986453 +checksum=8b712588e383c4326c27cfec5dd2c9fd4c9a4597f82549f55b1909e799f55e13 conflicts="lxd" provides="lxd-${version}_${revision}" system_groups="lxd" -broken="error: 'dqlite_logger' {aka 'struct dqlite_logger'} has no member named 'ctx'" + +_libdir="/usr/lib/sqlite-replication" +LDFLAGS="-L${XBPS_CROSS_BASE}${_libdir} -Wl,-R${_libdir}" do_configure() { # the LXD tarball packages up the required dependencies - ln -s "$wrksrc/dist" "$GOPATH" + ln -s "$wrksrc/_dist" "$GOPATH" } do_build() { @@ -36,6 +38,5 @@ do_build() { post_install() { vinstall scripts/bash/lxd-client 644 /usr/share/bash-completion/completions lxd - vlicense COPYING LICENSE vsv lxd }