diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2021-01-23 16:26:46 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-01-23 16:28:04 +0100 |
| commit | cabc71e350affd59fcbbaec8235faa0ef106c8b6 (patch) | |
| tree | 9cd08c20b4db54ae1ad6b138290c0d730dd0781c | |
| parent | gnome-extra/gnome-shell-extension-bing-wallpaper: Bump to v28 (diff) | |
| download | gentoo-cabc71e350affd59fcbbaec8235faa0ef106c8b6.tar.gz gentoo-cabc71e350affd59fcbbaec8235faa0ef106c8b6.tar.bz2 gentoo-cabc71e350affd59fcbbaec8235faa0ef106c8b6.zip | |
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@gentoo.org>
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 203c905e1c68..8b0ce8fdad51 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 1ad14695c634..d80bdfa74e82 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 88889b42904e..5d7a1d8dc05b 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 e5a1d02609e0..67687ea276c1 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 e5a1d02609e0..67687ea276c1 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} |