Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/
Date: Thu, 02 Apr 2020 06:29:50
Message-Id: 1585808978.a6b6c83369a95506c769e50089c341e8e4d03bfd.slyfox@gentoo
1 commit: a6b6c83369a95506c769e50089c341e8e4d03bfd
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Sun Sep 1 05:02:38 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 2 06:29:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b6c833
7
8 sys-libs/libunwind: Delete obsolete code.
9
10 eutils.eclass is not used.
11
12 Broken symbolic link libunwind-generic.a is not created by build system
13 with --disable-static option passed since:
14 https://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=commit;h=4e8b7a595e144e905fd9c8aed053d7529afb78a4
15
16 Bug: https://bugs.gentoo.org/693250
17 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
18 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
19
20 sys-libs/libunwind/libunwind-1.3.1.ebuild | 12 +++++-------
21 sys-libs/libunwind/libunwind-1.4.0.ebuild | 12 +++++-------
22 2 files changed, 10 insertions(+), 14 deletions(-)
23
24 diff --git a/sys-libs/libunwind/libunwind-1.3.1.ebuild b/sys-libs/libunwind/libunwind-1.3.1.ebuild
25 index 94aac72ea36..83400a3ec9b 100644
26 --- a/sys-libs/libunwind/libunwind-1.3.1.ebuild
27 +++ b/sys-libs/libunwind/libunwind-1.3.1.ebuild
28 @@ -1,11 +1,11 @@
29 -# Copyright 1999-2020 Gentoo Authors
30 +# Copyright 2005-2020 Gentoo Authors
31 # Distributed under the terms of the GNU General Public License v2
32
33 EAPI=7
34
35 MY_PV=${PV/_/-}
36 MY_P=${PN}-${MY_PV}
37 -inherit autotools eutils flag-o-matic libtool multilib-minimal
38 +inherit autotools flag-o-matic libtool multilib-minimal
39
40 DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
41 HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
42 @@ -53,13 +53,13 @@ src_prepare() {
43 default
44 chmod +x src/ia64/mk_cursor_i || die
45 # Since we have tests disabled via RESTRICT, disable building in the subdir
46 - # entirely. This worksaround some build errors too. #484846
47 + # entirely. This works around some build errors too. #484846
48 sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die
49
50 elibtoolize
51 eautoreconf
52
53 - # Let's wait for proer fix upstream in https://github.com/libunwind/libunwind/issues/154
54 + # Let's wait for proper fix upstream in https://github.com/libunwind/libunwind/issues/154
55 # Meanwhile workaround for gcc-10 with -fcommon, bug #706560
56 append-cflags -fcommon
57 }
58 @@ -99,7 +99,5 @@ multilib_src_test() {
59
60 multilib_src_install() {
61 default
62 - # libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without
63 - # shared library, so we keep it in any case
64 - use static-libs || find "${ED}"usr '(' -name 'libunwind-generic.a' -o -name 'libunwind*.la' ')' -delete
65 + use static-libs || find "${ED}"/usr -name 'libunwind*.la' -delete
66 }
67
68 diff --git a/sys-libs/libunwind/libunwind-1.4.0.ebuild b/sys-libs/libunwind/libunwind-1.4.0.ebuild
69 index 95a06d19298..9ca0fb123dc 100644
70 --- a/sys-libs/libunwind/libunwind-1.4.0.ebuild
71 +++ b/sys-libs/libunwind/libunwind-1.4.0.ebuild
72 @@ -1,11 +1,11 @@
73 -# Copyright 1999-2020 Gentoo Authors
74 +# Copyright 2005-2020 Gentoo Authors
75 # Distributed under the terms of the GNU General Public License v2
76
77 EAPI=7
78
79 MY_PV=${PV/_/-}
80 MY_P=${PN}-${MY_PV}
81 -inherit autotools eutils flag-o-matic libtool multilib-minimal
82 +inherit autotools flag-o-matic libtool multilib-minimal
83
84 DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
85 HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
86 @@ -53,13 +53,13 @@ src_prepare() {
87 default
88 chmod +x src/ia64/mk_cursor_i || die
89 # Since we have tests disabled via RESTRICT, disable building in the subdir
90 - # entirely. This worksaround some build errors too. #484846
91 + # entirely. This works around some build errors too. #484846
92 sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die
93
94 elibtoolize
95 eautoreconf
96
97 - # Let's wait for proer fix upstream in https://github.com/libunwind/libunwind/issues/154
98 + # Let's wait for proper fix upstream in https://github.com/libunwind/libunwind/issues/154
99 # Meanwhile workaround for gcc-10 with -fcommon, bug #706560
100 append-cflags -fcommon
101 }
102 @@ -99,7 +99,5 @@ multilib_src_test() {
103
104 multilib_src_install() {
105 default
106 - # libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without
107 - # shared library, so we keep it in any case
108 - use static-libs || find "${ED}"usr '(' -name 'libunwind-generic.a' -o -name 'libunwind*.la' ')' -delete
109 + use static-libs || find "${ED}"/usr -name 'libunwind*.la' -delete
110 }