commit:     5d2b71f562ab76e38974cb928567b3acd12d795c
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 08:30:19 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 15 08:30:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2b71f5

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 <AT> gentoo.org>

 app-emulation/lxd/lxd-4.0.1.ebuild | 6 ++++--
 1 file 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 876dcde968a..020974b79e2 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
 }

Reply via email to