media-sound/jack-2.22.1: fix multilib
recent git implementations require safe.directory to work properly https://bugs.gentoo.org/879353 https://github.com/gentoo/gentoo/pull/28154 The current fix for #879353, commit 207a50da440b7c6bea060972a7684e792c2a84fc, does not address the install, as observed in https://github.com/LADI/os-gentoo-overlay/issues/1#issuecomment-1629783361 This is workaround for https://github.com/LADI/os-gentoo-overlay/issues/1 The git eclass should handle this situation without ebuild workarounds.
This commit is contained in:
parent
511cdba71e
commit
32d96fe2f6
|
@ -5,7 +5,7 @@ EAPI=8
|
|||
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
inherit flag-o-matic python-single-r1 waf-utils
|
||||
inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
|
||||
inherit git-r3
|
||||
|
||||
EGIT_REPO_URI="https://github.com/LADI/jack2.git"
|
||||
|
@ -23,12 +23,12 @@ REQUIRED_USE="
|
|||
${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
sys-apps/dbus
|
||||
libsamplerate? ( media-libs/libsamplerate )
|
||||
ieee1394? ( media-libs/libffado )
|
||||
metadata? ( sys-libs/db )
|
||||
opus? ( media-libs/opus[custom-modes] )"
|
||||
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
|
||||
sys-apps/dbus[${MULTILIB_USEDEP}]
|
||||
libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
|
||||
ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
|
||||
metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
|
||||
opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
pam? ( sys-auth/realtime-base )
|
||||
|
@ -42,7 +42,16 @@ PDEPEND=""
|
|||
|
||||
DOCS=( AUTHORS.rst NEWS.rst README.rst README_NETJACK2 )
|
||||
|
||||
src_configure() {
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# changing waf shebang in-tree causes git state to be dirty
|
||||
#python_fix_shebang waf
|
||||
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# clients crash if built with lto
|
||||
# https://github.com/jackaudio/jack2/issues/485
|
||||
filter-lto
|
||||
|
@ -53,7 +62,7 @@ src_configure() {
|
|||
--alsa=$(usex alsa)
|
||||
--celt=no
|
||||
--db=$(usex metadata)
|
||||
--doxygen=$(usex doc)
|
||||
--doxygen=$(multilib_native_usex doc)
|
||||
--firewire=$(usex ieee1394)
|
||||
--iio=no
|
||||
--opus=$(usex opus)
|
||||
|
@ -66,10 +75,12 @@ src_configure() {
|
|||
waf-utils_src_configure "${wafargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
multilib_src_compile() {
|
||||
waf-utils_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
multilib_src_install() {
|
||||
git config --global --add safe.directory \
|
||||
"$(cd "${out_dir}" && echo "${PWD}")" || die
|
||||
waf-utils_src_install
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue