commit: 8aba75f223d0b5d4f4f5620120b3df688fdc94c4 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Mon Jun 15 00:00:52 2020 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Mon Jun 15 02:29:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aba75f2
dev-libs/libucl: remove static libs + libtool .la Closes: https://bugs.gentoo.org/727388 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> Closes: https://github.com/gentoo/gentoo/pull/16247 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> dev-libs/libucl/{libucl-0.8.1.ebuild => libucl-0.8.1-r1.ebuild} | 7 +++++-- dev-libs/libucl/libucl-9999.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dev-libs/libucl/libucl-0.8.1.ebuild b/dev-libs/libucl/libucl-0.8.1-r1.ebuild similarity index 84% rename from dev-libs/libucl/libucl-0.8.1.ebuild rename to dev-libs/libucl/libucl-0.8.1-r1.ebuild index a019e11cbc8..3a7e1f46c4f 100644 --- a/dev-libs/libucl/libucl-0.8.1.ebuild +++ b/dev-libs/libucl/libucl-0.8.1-r1.ebuild @@ -19,7 +19,7 @@ fi LICENSE="BSD-2" SLOT="0" -IUSE="lua +regex sign urls +utils static" +IUSE="lua +regex sign urls +utils static-libs" DEPEND="!!dev-libs/ucl lua? ( >=dev-lang/lua-5.1:= ) @@ -53,5 +53,8 @@ src_install() { default DOCS+=( $(usex lua "doc/lua_api.md" "") ) einstalldocs - use static || find "${ED}" -name "*.la" -delete + if ! use static-libs; then + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \ + die "error while deleting static library" + fi } diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild index a019e11cbc8..3a7e1f46c4f 100644 --- a/dev-libs/libucl/libucl-9999.ebuild +++ b/dev-libs/libucl/libucl-9999.ebuild @@ -19,7 +19,7 @@ fi LICENSE="BSD-2" SLOT="0" -IUSE="lua +regex sign urls +utils static" +IUSE="lua +regex sign urls +utils static-libs" DEPEND="!!dev-libs/ucl lua? ( >=dev-lang/lua-5.1:= ) @@ -53,5 +53,8 @@ src_install() { default DOCS+=( $(usex lua "doc/lua_api.md" "") ) einstalldocs - use static || find "${ED}" -name "*.la" -delete + if ! use static-libs; then + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \ + die "error while deleting static library" + fi }
