Skip to content

Commit

Permalink
media-sound/apulse: fix wrapper installation on multilib setups
Browse files Browse the repository at this point in the history
Wrapper installation was broken on multilib setups with newest bash
versions. In order to avoid environment driven eclass problems
manual installation of required wrappers is added.

Thanks  Karl-Johan Karlsson (creideiki+gentoo-bugzilla_lysator.liu.se)
for detailed reporting and testing.

Closes: https://bugs.gentoo.org/666884
Signed-off-by: Andrew Savchenko <[email protected]>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
  • Loading branch information
bircoph committed Sep 25, 2018
1 parent 465561b commit 78bff4d
Showing 1 changed file with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,16 @@ multilib_src_test() {
emake check
}

multilib_src_install() {
multilib_src_install_all() {
cmake-utils_src_install
# The easiest way would be setting MULTILIB_CHOST_TOOLS at global scope, depending
# on USE=sdk, but this is no longer permitted, so workaround is required.
# See bug 666884 for details.
if ! use sdk; then
export MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
multilib_prepare_wrappers
unset BUILD_DIR
_install_wrapper() { newbin "${BUILD_DIR}/apulse" "${CHOST}-apulse"; }
multilib_foreach_abi _install_wrapper
dobin "${T}/apulse"
fi
}

multilib_src_install_all() {
use sdk || dobin "${T}/apulse"
einstalldocs
}

0 comments on commit 78bff4d

Please sign in to comment.