From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7697C15813A for ; Thu, 09 Jan 2025 23:05:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 784FAE077C; Thu, 09 Jan 2025 23:05:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4CF9DE076B for ; Thu, 09 Jan 2025 23:05:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73EF5335DEB for ; Thu, 09 Jan 2025 23:05:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D53751DD6 for ; Thu, 09 Jan 2025 23:05:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1736463842.c6bd548361bf2fd9ce4465b3528437490d56029e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/osl/osl-1.12.14.0-r2.ebuild media-libs/osl/osl-1.13.10.0.ebuild media-libs/osl/osl-1.13.12.0.ebuild media-libs/osl/osl-9999.ebuild X-VCS-Directories: media-libs/osl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c6bd548361bf2fd9ce4465b3528437490d56029e X-VCS-Branch: master Date: Thu, 09 Jan 2025 23:05:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eeaa6682-48d0-4093-bf0e-5f25fb439be8 X-Archives-Hash: 5cfa7f071f6b10bd11b2f9c53b63b1e9 commit: c6bd548361bf2fd9ce4465b3528437490d56029e Author: Paul Zander gmail com> AuthorDate: Thu Jan 9 21:15:57 2025 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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 }