commit: c6bd548361bf2fd9ce4465b3528437490d56029e Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Thu Jan 9 21:15:57 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 9 23:04:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6bd5483
media-libs/osl: fix batched installed on non amd64 #935156 Closes: https://bugs.gentoo.org/935156 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/osl/osl-1.12.14.0-r2.ebuild | 11 +++++++++++ media-libs/osl/osl-1.13.10.0.ebuild | 9 ++++++--- media-libs/osl/osl-1.13.12.0.ebuild | 9 ++++++--- media-libs/osl/osl-9999.ebuild | 9 ++++++--- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/media-libs/osl/osl-1.12.14.0-r2.ebuild b/media-libs/osl/osl-1.12.14.0-r2.ebuild index dc269dddcea9..966883ca7f4a 100644 --- a/media-libs/osl/osl-1.12.14.0-r2.ebuild +++ b/media-libs/osl/osl-1.12.14.0-r2.ebuild @@ -387,3 +387,14 @@ src_test() { cmake_src_test } + +src_install() { + cmake_src_install + + if use amd64; then + find "${ED}/usr/$(get_libdir)" -type f -name 'lib_*_oslexec.so' -print0 \ + | while IFS= read -r -d $'\0' batched_lib; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done + fi +} diff --git a/media-libs/osl/osl-1.13.10.0.ebuild b/media-libs/osl/osl-1.13.10.0.ebuild index b8cee5f33486..7dd14efb1b3d 100644 --- a/media-libs/osl/osl-1.13.10.0.ebuild +++ b/media-libs/osl/osl-1.13.10.0.ebuild @@ -320,7 +320,10 @@ src_install() { rm -rf "${ED}/usr/build-scripts" || die fi - for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do - patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die - done + if use amd64; then + find "${ED}/usr/$(get_libdir)" -type f -name 'lib_*_oslexec.so' -print0 \ + | while IFS= read -r -d $'\0' batched_lib; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done + fi } diff --git a/media-libs/osl/osl-1.13.12.0.ebuild b/media-libs/osl/osl-1.13.12.0.ebuild index ed68fd687ad2..b414059494f0 100644 --- a/media-libs/osl/osl-1.13.12.0.ebuild +++ b/media-libs/osl/osl-1.13.12.0.ebuild @@ -319,7 +319,10 @@ src_install() { rm -rf "${ED}/usr/build-scripts" || die fi - for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do - patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die - done + if use amd64; then + find "${ED}/usr/$(get_libdir)" -type f -name 'lib_*_oslexec.so' -print0 \ + | while IFS= read -r -d $'\0' batched_lib; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done + fi } diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild index ed68fd687ad2..b414059494f0 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-9999.ebuild @@ -319,7 +319,10 @@ src_install() { rm -rf "${ED}/usr/build-scripts" || die fi - for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do - patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die - done + if use amd64; then + find "${ED}/usr/$(get_libdir)" -type f -name 'lib_*_oslexec.so' -print0 \ + | while IFS= read -r -d $'\0' batched_lib; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done + fi }
