Skip to content

Commit

Permalink
app-emulation/libvirt: Specify docdir on configure cmd line
Browse files Browse the repository at this point in the history
Up until very recently libvirt did not allow specifying docdir
via any (meson) configure option. That is why we patched
meson.build and changed docdir to point where we wanted it to
point. Well, this is changed with upstream commit of
v7.1.0-145-gee4a392dda. Therefore, don't patch the meson.build
file anymore and specify docdir like this:

  -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Closes: #19909
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
  • Loading branch information
zippy2 authored and juippis committed Mar 15, 2021
1 parent 7b702c6 commit cc20e62
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app-emulation/libvirt/libvirt-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ DEPEND="${BDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
)

Expand Down Expand Up @@ -276,6 +275,7 @@ src_configure() {

--localstatedir="${EPREFIX}/var"
-Drunstatedir="${EPREFIX}/run"
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)

meson_src_configure
Expand Down

0 comments on commit cc20e62

Please sign in to comment.