From 3041a15bfd216a0ecc10a9ee79972281eaafc7b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Tue, 19 Oct 2021 18:35:14 +0200 Subject: [PATCH] eclass/bintron.eclass: add arguments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to bintron_remove_language_paks and bintron_system_replace Signed-off-by: Maciej Barć --- eclass/bintron.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eclass/bintron.eclass b/eclass/bintron.eclass index 46660df..8d85a74 100644 --- a/eclass/bintron.eclass +++ b/eclass/bintron.eclass @@ -140,7 +140,7 @@ QA_PRESTRIPPED='*' # not selected via the L10N variable. # Also performs QA checks to ensure BINTRON_LANGS has been set correctly. function bintron_remove_language_paks() { - pushd ./locales >/dev/null || die + pushd "${1:=.}" >/dev/null || die # Look for missing pak files. local lang @@ -175,6 +175,8 @@ function bintron_remove_language_paks() { # @DESCRIPTION: # Replace bundled libraries with system libraries. function bintron_system_replace() { + pushd "${1:=.}" >/dev/null || die + if use system-ffmpeg; then echo "Replacing bundled libffmpeg" @@ -198,6 +200,8 @@ function bintron_system_replace() { die "Failed: link libvulkan" fi fi + + popd >/dev/null || die } @@ -206,8 +210,8 @@ function bintron_system_replace() { # Default src_prepare. function bintron_src_prepare() { xdg_src_prepare - bintron_remove_language_paks - bintron_system_replace + bintron_remove_language_paks . + bintron_system_replace . }