From 20351aa645b1bc5ad446a6ea4a12411956feecef Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 1 Sep 2019 05:02:38 +0000 Subject: [PATCH 1/2] sys-libs/libunwind: Delete obsolete code. eutils.eclass is not used. Broken symbolic link libunwind-generic.a is not created by build system with --disable-static option passed since: https://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=commit;h=4e8b7a595e144e905fd9c8aed053d7529afb78a4 Bug: https://bugs.gentoo.org/693250 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- sys-libs/libunwind/libunwind-1.3.1.ebuild | 12 +++++------- sys-libs/libunwind/libunwind-1.4.0.ebuild | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/sys-libs/libunwind/libunwind-1.3.1.ebuild b/sys-libs/libunwind/libunwind-1.3.1.ebuild index 94aac72ea36..83400a3ec9b 100644 --- a/sys-libs/libunwind/libunwind-1.3.1.ebuild +++ b/sys-libs/libunwind/libunwind-1.3.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2005-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 MY_PV=${PV/_/-} MY_P=${PN}-${MY_PV} -inherit autotools eutils flag-o-matic libtool multilib-minimal +inherit autotools flag-o-matic libtool multilib-minimal DESCRIPTION="Portable and efficient API to determine the call-chain of a program" HOMEPAGE="https://savannah.nongnu.org/projects/libunwind" @@ -53,13 +53,13 @@ src_prepare() { default chmod +x src/ia64/mk_cursor_i || die # Since we have tests disabled via RESTRICT, disable building in the subdir - # entirely. This worksaround some build errors too. #484846 + # entirely. This works around some build errors too. #484846 sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die elibtoolize eautoreconf - # Let's wait for proer fix upstream in https://github.com/libunwind/libunwind/issues/154 + # Let's wait for proper fix upstream in https://github.com/libunwind/libunwind/issues/154 # Meanwhile workaround for gcc-10 with -fcommon, bug #706560 append-cflags -fcommon } @@ -99,7 +99,5 @@ multilib_src_test() { multilib_src_install() { default - # libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without - # shared library, so we keep it in any case - use static-libs || find "${ED}"usr '(' -name 'libunwind-generic.a' -o -name 'libunwind*.la' ')' -delete + use static-libs || find "${ED}"/usr -name 'libunwind*.la' -delete } diff --git a/sys-libs/libunwind/libunwind-1.4.0.ebuild b/sys-libs/libunwind/libunwind-1.4.0.ebuild index 95a06d19298..9ca0fb123dc 100644 --- a/sys-libs/libunwind/libunwind-1.4.0.ebuild +++ b/sys-libs/libunwind/libunwind-1.4.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2005-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 MY_PV=${PV/_/-} MY_P=${PN}-${MY_PV} -inherit autotools eutils flag-o-matic libtool multilib-minimal +inherit autotools flag-o-matic libtool multilib-minimal DESCRIPTION="Portable and efficient API to determine the call-chain of a program" HOMEPAGE="https://savannah.nongnu.org/projects/libunwind" @@ -53,13 +53,13 @@ src_prepare() { default chmod +x src/ia64/mk_cursor_i || die # Since we have tests disabled via RESTRICT, disable building in the subdir - # entirely. This worksaround some build errors too. #484846 + # entirely. This works around some build errors too. #484846 sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die elibtoolize eautoreconf - # Let's wait for proer fix upstream in https://github.com/libunwind/libunwind/issues/154 + # Let's wait for proper fix upstream in https://github.com/libunwind/libunwind/issues/154 # Meanwhile workaround for gcc-10 with -fcommon, bug #706560 append-cflags -fcommon } @@ -99,7 +99,5 @@ multilib_src_test() { multilib_src_install() { default - # libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without - # shared library, so we keep it in any case - use static-libs || find "${ED}"usr '(' -name 'libunwind-generic.a' -o -name 'libunwind*.la' ')' -delete + use static-libs || find "${ED}"/usr -name 'libunwind*.la' -delete } -- 2.26.0 From 3b8378dbcf281f0fafee2c7c0d6c54ebe6ab8f57 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 1 Sep 2019 05:02:38 +0000 Subject: [PATCH 2/2] sys-libs/libunwind: Unconditionally drop *.la files. *.pc files are installed. Closes: https://bugs.gentoo.org/693250 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- sys-libs/libunwind/libunwind-1.4.0.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys-libs/libunwind/libunwind-1.4.0.ebuild b/sys-libs/libunwind/libunwind-1.4.0.ebuild index 9ca0fb123dc..00f1da15174 100644 --- a/sys-libs/libunwind/libunwind-1.4.0.ebuild +++ b/sys-libs/libunwind/libunwind-1.4.0.ebuild @@ -97,7 +97,6 @@ multilib_src_test() { SANDBOX_ON=0 emake check } -multilib_src_install() { - default - use static-libs || find "${ED}"/usr -name 'libunwind*.la' -delete +multilib_src_install_all() { + find "${D}" -name "*.la" -type f -delete || die } -- 2.26.0