commit: cabc71e350affd59fcbbaec8235faa0ef106c8b6 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Jan 23 15:26:46 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat Jan 23 15:28:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cabc71e3
media-gfx/imagemagick: Fixed build with sys-devel/slibtool Bug: https://bugs.gentoo.org/766683 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild | 2 +- media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild | 2 +- media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild | 2 +- media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild | 2 +- media-gfx/imagemagick/imagemagick-9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild index 203c905e1c6..8b0ce8fdad5 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild @@ -206,7 +206,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild index 1ad14695c63..d80bdfa74e8 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild @@ -206,7 +206,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild index 88889b42904..5d7a1d8dc05 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild @@ -220,7 +220,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild index e5a1d02609e..67687ea276c 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild @@ -220,7 +220,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN} diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index e5a1d02609e..67687ea276c 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -220,7 +220,7 @@ src_install() { find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + # .la files in parent are not needed, keep plugin .la files - rm "${ED}"/usr/$(get_libdir)/*.la || die + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die if use opencl; then cat <<-EOF > "${T}"/99${PN}