summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2020-05-15 11:30:19 +0300
committerJoonas Niilola <juippis@gentoo.org>2020-05-15 11:30:42 +0300
commit5d2b71f562ab76e38974cb928567b3acd12d795c (patch)
treed5160a5a63325cc8f8e7bfa340f64e6f320de061 /app-emulation/lxd
parentsys-fs/lxcfs: remove redundant dodir (diff)
downloadgentoo-5d2b71f562ab76e38974cb928567b3acd12d795c.tar.gz
gentoo-5d2b71f562ab76e38974cb928567b3acd12d795c.tar.bz2
gentoo-5d2b71f562ab76e38974cb928567b3acd12d795c.zip
app-emulation/lxd: copy zfs fix from 3.16 ebuild to 4 LTS
Closes: https://bugs.gentoo.org/723208 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'app-emulation/lxd')
-rw-r--r--app-emulation/lxd/lxd-4.0.1.ebuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild b/app-emulation/lxd/lxd-4.0.1.ebuild
index 876dcde968a3..020974b79e2e 100644
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -79,13 +79,15 @@ common_op() {
src_prepare() {
default
+ export GOPATH="${S}/_dist"
+
sed -i \
-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
-e "s:make:make ${MAKEOPTS}:g" \
Makefile || die
- cd "${GOPATH}"/deps/libco || die
- sed -i 's#lib$#lib/lxd#' Makefile || die
+ sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
+ sed -i 's#zfs version | cut -f 2#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
common_op eautoreconf
}