Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cgdb/
Date: Thu, 17 Sep 2020 06:06:49
Message-Id: 1600322800.5e101aa053b245bf7f4833e1a10fb57b73a4d236.sam@gentoo
1 commit: 5e101aa053b245bf7f4833e1a10fb57b73a4d236
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Wed Sep 16 11:52:45 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 17 06:06:40 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e101aa0
7
8 dev-util/cgdb: call default at the beginning of src_prepare
9
10 `default` should be called before `cp` in src_prepare as not doing that results in copying unpatched configure.init file, leading to
11 the ebuild again calling ar directly
12
13 Closes: https://bugs.gentoo.org/742731
14 Package-Manager: Portage-3.0.4, Repoman-3.0.1
15 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
16 Closes: https://github.com/gentoo/gentoo/pull/17563
17 Signed-off-by: Sam James <sam <AT> gentoo.org>
18
19 dev-util/cgdb/cgdb-0.6.8.ebuild | 2 +-
20 dev-util/cgdb/cgdb-0.7.0-r2.ebuild | 2 +-
21 dev-util/cgdb/cgdb-0.7.1.ebuild | 2 +-
22 dev-util/cgdb/cgdb-9999.ebuild | 2 +-
23 4 files changed, 4 insertions(+), 4 deletions(-)
24
25 diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
26 index a9898610f2c..357b17b658a 100644
27 --- a/dev-util/cgdb/cgdb-0.6.8.ebuild
28 +++ b/dev-util/cgdb/cgdb-0.6.8.ebuild
29 @@ -41,8 +41,8 @@ PATCHES=(
30 )
31
32 src_prepare() {
33 - cp configure.{init,ac} || die "cp failed"
34 default
35 + cp configure.{init,ac} || die "cp failed"
36 AT_M4DIR="config" eautoreconf
37 }
38
39
40 diff --git a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
41 index 8d910b72d84..ba5293f966b 100644
42 --- a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
43 +++ b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
44 @@ -46,8 +46,8 @@ PATCHES=(
45 )
46
47 src_prepare() {
48 - cp configure.{init,ac} || die "cp failed"
49 default
50 + cp configure.{init,ac} || die "cp failed"
51 AT_M4DIR="config" eautoreconf
52 }
53
54
55 diff --git a/dev-util/cgdb/cgdb-0.7.1.ebuild b/dev-util/cgdb/cgdb-0.7.1.ebuild
56 index c3a44fb28ef..79f79a24916 100644
57 --- a/dev-util/cgdb/cgdb-0.7.1.ebuild
58 +++ b/dev-util/cgdb/cgdb-0.7.1.ebuild
59 @@ -46,8 +46,8 @@ PATCHES=(
60 )
61
62 src_prepare() {
63 - cp configure.{init,ac} || die "cp failed"
64 default
65 + cp configure.{init,ac} || die "cp failed"
66 AT_M4DIR="config" eautoreconf
67 }
68
69
70 diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
71 index d791301bd98..191687d3b09 100644
72 --- a/dev-util/cgdb/cgdb-9999.ebuild
73 +++ b/dev-util/cgdb/cgdb-9999.ebuild
74 @@ -44,8 +44,8 @@ PATCHES=(
75 )
76
77 src_prepare() {
78 - cp configure.{init,ac} || die "cp failed"
79 default
80 + cp configure.{init,ac} || die "cp failed"
81 AT_M4DIR="config" eautoreconf
82 }