diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
commit | e68d405c5d712af4387159df07e226217bdda049 (patch) | |
tree | 009ab0f3d427f0813e62930d71802cb054c07e30 /eclass/gstreamer-meson.eclass | |
parent | 401101f9c8077911929d3f2b60a37098460a5d89 (diff) |
gentoo resync : 06.04.2022
Diffstat (limited to 'eclass/gstreamer-meson.eclass')
-rw-r--r-- | eclass/gstreamer-meson.eclass | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass index 490e71e9b97b..bae35c7edcea 100644 --- a/eclass/gstreamer-meson.eclass +++ b/eclass/gstreamer-meson.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gstreamer-meson.eclass @@ -383,12 +383,20 @@ gstreamer_multilib_src_compile() { if [[ "${PN}" == "${GST_ORG_MODULE}" ]]; then eninja else - local plugin_dir plugin + local plugin_dir plugin build_dir for plugin_dir in ${GST_PLUGINS_BUILD_DIR} ; do plugin=$(_gstreamer_get_target_filename $(gstreamer_get_plugin_dir ${plugin_dir})) + # Read full link of build directory. Outputs symlink's true link. + # We want to get the full file path so it can be removed later. + # Working around ninja issues w/ symlinks (e.g. PORTAGE_TMPDIR as a symlink) + + # https://github.com/ninja-build/ninja/issues/1251 + # https://github.com/ninja-build/ninja/issues/1330 + build_dir=$(readlink -f ${BUILD_DIR}) + plugin_path="${plugin%%:*}" - eninja "${plugin_path/"${BUILD_DIR}/"}" + eninja "${plugin_path/"${build_dir}/"/}" done fi } |